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: Ic31dc28b6a6139ea0b2d9af5576b2fad9e091386