Merge "Merge "[Bugfix]avoid NPE when getPreferredActivitiesInternal" am:...

Merge "Merge "[Bugfix]avoid NPE when getPreferredActivitiesInternal" am: 73218d88 am: 8130300d am: 27295552" into udc-dev-plus-aosp am: 1115ec6d

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



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