Merge "Keep ControlsActivity on orientation change" into tm-qpr-dev am: 430344861c am: 04544d39e7

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

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