[automerger skipped] [DO NOT MERGE] Controls - Do not recreate intent am: d7b16dd2a5 am: f738919e90 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I64c221298cfbd1f02dc9fd44edf3cc2427721515