Merge "Controls - Do not recreate intent" into sc-dev am: 060ab6630b am: 467bcd0ab1

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

Change-Id: I03f626c34a3c8cd61ba5bd0aa5d9d3693f9a7081