Merge "Merge "Controls UI - Add PIN dialog" into rvc-dev am: 3f164ee5 am: a45d5b8f" into rvc-d1-dev-plus-aosp am: a3ccd020 Change-Id: I3762c15b2d947d3fbaa6ac811ab7d90196292ce5