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

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

Change-Id: Ie1e91f8bc2d46b79ab15333778b1cef7b14ef1f8