[automerger skipped] Unexport ControlsActivity am: 3c4532fb -s ours am:...

[automerger skipped] Unexport ControlsActivity am: 3c4532fb -s ours am: cee5ad59 -s ours am: ef765ab5 -s ours

am skip reason: Merged-In I6280b501b799596099935dc61ecef0b431dd8333 with SHA-1 7f833f2e is already in history

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



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