[automerger skipped] Merge "[DO NOT MERGE] Get legacy recents working for secondary user" am: 786e7f34fa am: 67a8fa0ff7
am: 909b40c927 -s ours
am skip reason: subject contains skip directive

Change-Id: I4d53f485ed20bbeec0bf58ae3efa8dbdc038f067