Merge "[RFPM01] Merge package added/removed methods" am: fac73070cc am: 18da2dcce5

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

Change-Id: Ida8f82d2ec5be1040a2bdf2aa65a94d53f68ea6c
tree: 0c8b432e10b81338361ec51d97074362898621ea
  1. core/
  2. services/
  3. tests/