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 am: f64564c2 am: 72f1f540

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



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