Merge "Device state rotation: fallback to defaults for invalid ignored state"...

Merge "Device state rotation: fallback to defaults for invalid ignored state" into tm-qpr-dev am: 4e0e3b70

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



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