Merge "Attempted fix for IllegalStateException" into tm-qpr-dev am: c143f762 am: 279774f6 am: 5cab4953 am: d958e6f0

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



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