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

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

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



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