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