Merge "Controls - Handle launching/back from activities" into sc-dev am: 5d22e6ad37

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I439537c2eb17f452e081883e648c6be1f589060f