Merge "Controls UI - Tap for NO_TEMPLATE" into rvc-dev am: d6fb5e2151 am: d7c6a998a1 am: 4913eb2f6b am: 4f7a659aca

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

Change-Id: I469805c9dafe41f1444017b7b8b6cde005b71682