[automerger skipped] Merge "Delete useTargetActivityForQuickAccess." into...

[automerger skipped] Merge "Delete useTargetActivityForQuickAccess." into tm-dev am: f5debd0b -s ours

am skip reason: Merged-In Ic71dd1f3710f9871965cabbb7580b77468661f02 with SHA-1 2b8b5198 is already in history

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



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