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 am: e167dded am: 5e690937 am: aea63db9

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



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