Merge "Merge "Do not show bouncer field when bouncer is hidden" into qt-dev...
Merge "Merge "Do not show bouncer field when bouncer is hidden" into qt-dev am: 8bf9743b" into qt-dev-plus-aosp
am: 19bf383f
Change-Id: I141c17beac0d4fd25bb5fffe0000fab526a2ef0e