Merge "Controls UI - Tap for NO_TEMPLATE" into rvc-dev am: d6fb5e2151 am: df58dcf081 am: 05b0ccb2ec am: 1509ada3fe

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

Change-Id: I8aa868de38e3f737ca26da150be9eded253376ad