Merge "Adding per-app support for app add/remove" am: d4ea14be1d am: ae60f9f720 am: 39e505fc31

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

Change-Id: I72d9981b2a6febc218c30926e58072f43e8bf0a5