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: 536af8c2 am: 8c941de7

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



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