Merge "Fix blank screen when launching controls activity" into tm-qpr-dev am:...

Merge "Fix blank screen when launching controls activity" into tm-qpr-dev am: 9434998b am: 5b09c697

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



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