Merge "Improve AmbientState test coverage" into tm-qpr-dev am: 0ae95adb am: 1b8ac950

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



Change-Id: Iae3e7e084624b92cd3c5cd704e1bdd2b20878604
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>