Merge "Remove permission token from startActivityAsCaller" into tm-dev am: fe4b8185

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



Change-Id: Ib07e4d43929ebd022578ccb2830d1a1fe82db3e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>