Merge "Fix recent apps in system UI for Skia pipeline" into oc-dev am: dad0ba155e
am: cc78864bb7  -s ours

Change-Id: Iecc3a54b082c07840b372d1833d3e107d77b8573