Merge "Checks that state requested from top app is a state we allow" into...

Merge "Checks that state requested from top app is a state we allow" into tm-dev am: 67580353 am: 98411c1e

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



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