[automerger skipped] Merge "Controls - Do not recreate intent" into sc-dev am:...

[automerger skipped] Merge "Controls - Do not recreate intent" into sc-dev am: 060ab663 am: 467bcd0a am: c2a9d574 -s ours

am skip reason: Merged-In Ib2b0342af85679c0514fb4d88530376b58e6e12a with SHA-1 96aa501b is already in history

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

Change-Id: I8a9bfbb7f45cebcee7d69160483ec8c7c26d0d3c