[automerger skipped] Merge "Fix clearRecentsByClearAll" into stage-aosp-master am: 1d0b8985 am: 7492d00a am: d7ed6ba1 -s ours Change-Id: I08c33c7dc600785620ff31a83acd680501762bed