Merge "[DO NOT MERGE] Controls - Do not recreate intent" into rvc-dev am: 2cc3ce9885

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

Change-Id: I44b00d64b67ad140d274446f2cbbc86d52a4044c