[automerger skipped] Merge "Merge "Use the correct user context in CustomTile" into rvc-dev am: f482c100 am: 658de573" into rvc-d1-dev-plus-aosp am: e364d4fa -s ours am: 43b12830 -s ours
am skip reason: Change-Id I92b26294dec63477943d28e2000fe3e0c16f8aa3 with SHA-1 4ba3f9aa is in history

Change-Id: I0d27c666ac50e7b92025b1c19ef4c075cf41bffe