Merge "Do not lock when calling startActivityFromRecents" into sc-v2-dev am: a752da8c80 am: 5b03a70925

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

Change-Id: Ida31eda0f96eecbc4c9e80885d2e9b1af22278f5