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: I002d6d46548d08169a0d2fd9edf5eb55a6e3c5ee