Merge "Fix NPE when loading recently opened apps on the Apps page" into udc-dev am: 9ea6429756 am: cc8d5f0de3 am: 87918f0773 am: 13e699df8f

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

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