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

[automerger skipped] [DO NOT MERGE] Controls - Do not recreate intent am: d7b16dd2 am: f738919e -s ours am: d3796868 -s ours am: 2aea3e34 -s ours am: 866e702a -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ief8d66515dd67f85bf7dc7a90696d104c9334ba1