[DO NOT MERGE] Controls - Do not recreate intent am: d7b16dd2a5

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

Change-Id: I7d17da929ecd548c21c0d088557ff20209952efe