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

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



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