[automerger skipped] Merge "[DO NOT MERGE] Controls - Do not recreate intent"...

[automerger skipped] Merge "[DO NOT MERGE] Controls - Do not recreate intent" into rvc-dev am: 2cc3ce98 am: 7c7026dc -s ours am: 731c2823 -s ours am: fb790ca8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0acfcc11a5f4b30e5f02cfd6d6edff3252be8497