Merge changes from topic "am-d482e2bc81af4f58836648b9fccb5c89"

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Set mAllowWhileInUsePermissionInFgs correctly when bindService() from background." into rvc-dev am: 970762d46c am: c6740a2382 -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Set mAllowWhileInUsePermissionInFgs correctly when bindService() from background. am: 346eed7325 am: f38a752863 -s ours