Merge "Fix NPE when loading recently opened apps on the Apps page" into udc-dev am: 9ea6429756 am: cc8d5f0de3 am: 5a95230c69 am: ab0ccf5935

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

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