[automerger skipped] Merge "Merge "Do not resolve ActivityInfo in...

[automerger skipped] Merge "Merge "Do not resolve ActivityInfo in navigateUpTo" into tm-qpr-dev am: 576b93c7" into tm-qpr-dev-plus-aosp am: fd711731 -s ours

am skip reason: Merged-In I9aa3e27f753f2f809e74a8f421f8b68e4d610702 with SHA-1 e3f0ca01 is already in history

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



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