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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic7d62f96ebaac6fbf24228fb6324a4b8b8037956