[automerger skipped] [DO NOT MERGE] Controls - Do not recreate intent am: d7b16dd2 am: 9b02d83a -s ours am: 86b98bc2 -s ours am: 80b18b13 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3d3cb54cc4a2f2d4138c2620fafca0e7e3898e26