[automerger skipped] Merge "Unexport ControlsActivity" into udc-dev am:...

[automerger skipped] Merge "Unexport ControlsActivity" into udc-dev am: 7a1f665c am: 5da09abb am: 3fc1b823 -s ours

am skip reason: Merged-In Iaf71532a498c03592ba1d97495eb984b6973ce05 with SHA-1 b1911637 is already in history

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



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