Merge "Merge "Merge "Fix NPE when reading icon for removed session." into...
Merge "Merge "Merge "Fix NPE when reading icon for removed session." into oc-dr1-dev am: 65abebba" into oc-mr1-dev am: 25cdef21" into oc-mr1-dev-plus-aosp
am: f749719e
Change-Id: Id188cf438f1425c266e6806f231fb65987a4f13c