[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 skip reason: subject contains skip directive

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

Change-Id: I7965e7a9727226e86e3045fdbafde51fe37c57fa