Merge "[RFPM01] Merge package added/removed methods" am: 6287112701

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

Change-Id: I0c7f6ab65220eaf0169fb4d88f9aec023ab33228