Merge "Fixes IllegalStateException through getSupportedStates" into udc-dev am: 2e089374 am: 84512ef4 am: 27dcfc90

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



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