Merge "Controls a11y - Ensure minHeight on dialogs" into rvc-dev am: 61bc481d62

Change-Id: Ie25494c6450331e9e7d444e5b24322b1f61c4e2b