Merge "Allow-list service-permission to not track latest api" am: dd5e2cd505 am: 48b91458bd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20418e10ff34befa8c5a77d0ba266f59df87887d