[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: I1908d840a1afd4654656cf3165a0e7b540479804