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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b59bb733630b806098e54ed4cd01ffb3864504b