Merge "RESTRICT AUTOMERGE Do not throw exception for unknown device state...

Merge "RESTRICT AUTOMERGE Do not throw exception for unknown device state policy" into tm-qpr-dev am: fcced236

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



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