[automerger skipped] Merge "RESTRICT AUTOMERGE: Set...

[automerger skipped] Merge "RESTRICT AUTOMERGE: Set mAllowWhileInUsePermissionInFgs correctly when bindService() from background." into rvc-dev am: 970762d4 am: 2005c4ee -s ours am: da3fa364 -s ours

am skip reason: Change-Id I7a240621267648ea54e7dc737ebc55bc665e39b6 with SHA-1 86bd39db is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie55644c12f681f01f4b3d69ba2c3df368771a30e