Merge "Specify the parent viewgroup that should hide controls" into tm-qpr-dev am: 9dfb2b2f

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



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