Merge "Fix AppEntry.extraInfo ClassCastException" am: 327867e56b
am: 83f2d27e35
am: 97c42d8736
am: e207694022
am: 7a86020bd8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2564510 Change-Id: I9e1d6d1fc05887802bdc39b87e1a075ed33b0c3f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: