Merge "Merge "Always include uid as part of recentApp key" into qt-dev am:...
Merge "Merge "Always include uid as part of recentApp key" into qt-dev am: 08ef7bd5 am: 52fa7546" into qt-r1-dev-plus-aosp
am: 478776a5
Change-Id: Ibca6104ef03b4c7c378dd55c561184408fe317f8