Merge "Adding per-app support for app add/remove" am: 922249e2bb am: 08119d7700

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

Change-Id: I6132b72fb299bf51a6667adcf801c9b751bf9feb