Merge "Merge "Checks that state requested from top app is a state we allow" into tm-dev am: 67580353 am: 6ff8902f am: 56a3efbb" into tm-qpr-dev-plus-aosp am: 6de5cdca

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



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