Merge "Stabalize AmbientContext detection by restoring client requests." into...

Merge "Stabalize AmbientContext detection by restoring client requests." into tm-dev am: 889d4894 am: 4061c609

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



Change-Id: I932f92ef75104ec6acfb90901c345b51f840acb7
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>