Merge changes from topic "am-988d137fe25a4a9cbc17ac163626bfc1" into rvc-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes If4e8e87c,Ie8e48422,Iab4974f9 am: c0f6f60d am: b6cce0c3 -s ours
  [automerger skipped] Un-expose LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH for R. am: c8c1919a am: a63b587f -s ours
  [automerger skipped] Un-expose ACTION_SERVICE_PROVIDERS_UPDATED. am: 6b2eddec am: 8798cc6c -s ours