Merge "Controls UI - Tap for NO_TEMPLATE" into rvc-dev am: d6fb5e2151

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

Change-Id: I13e5ed74ac82b79a7b72511b55c02cb6ad4c6573