Merge "Keep ControlsActivity on orientation change" into tm-qpr-dev am: 43034486 am: 04544d39 am: 2b0401ee am: 38128151

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



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