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

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

Change-Id: Idf2fa591c6882f5773b59ef1a03f4ac9134d3c26