Merge "Merge "Controls UI - Add PIN dialog" into rvc-dev am: 3f164ee5a7 am: a45d5b8f74" into rvc-d1-dev-plus-aosp am: a3ccd02050 am: 51ce20d2b2

Change-Id: I5c56869231236fa821f41ecb88b45a92a1ffe5be