Merge changes from topic "am-8fe1bfad79f84157a29ab2e38769dd1e" into rvc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Set mAllowWhileInUsePermissionInFgs correctly when bindService() from background." into rvc-dev am: 970762d46c am: 2005c4ee01 -s ours am: da3fa364ca -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Set mAllowWhileInUsePermissionInFgs correctly when bindService() from background. am: 346eed7325 am: 883e25f011 -s ours am: 6f4aadc779 -s ours