Merge "Make OverlayablePolicy as enum type" am: 8e87bfb4fb

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686174

Change-Id: I6d9b4b2d61624517784216832d74bfd4248981e8