[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: 920d225e -s ours am: 151e1ff4 -s ours am: 9c6fc1d3 -s ours am: aebceb03 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8ad51f155a39e94a08921508f604c34731f89dac