[automerger skipped] [DO NOT MERGE] Controls - Do not recreate intent am:...

[automerger skipped] [DO NOT MERGE] Controls - Do not recreate intent am: d7b16dd2 am: 9b02d83a -s ours am: 86b98bc2 -s ours am: 94f7d502 -s ours am: b0a24eb9 -s ours am: 66e07956 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3b67d17a47e2843e410c0d78fa5e63f154f48ad0