[automerger skipped] Merge "[DO NOT MERGE] Controls - Do not recreate intent" into rvc-dev am: 2cc3ce9885 am: 920d225e72 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I06a1e741f5830e11e97f7c3a9ddf13e88c68b7b2