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

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

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