Merge "[RFPM01] Merge package added/removed methods" am: 97c80a0e2f am: 97133b97ae am: 1d59118500 am: befbe7f72c am: a523acbda4

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

Change-Id: I8b789c3cb90357a6d408565201d80a13fad92587