[automerger skipped] Merge "RESTRICT AUTOMERGE Do not throw exception for...

[automerger skipped] Merge "RESTRICT AUTOMERGE Do not throw exception for unknown device state policy" into tm-qpr-dev am: fcced236 am: 80915453 -s ours

am skip reason: subject contains skip directive

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



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