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

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



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