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

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

Change-Id: I8f17e1a2a7e920cb1d49fe66d06728714580ef76