[automerger skipped] Merge "Use the correct user context in CustomTile" into...
[automerger skipped] Merge "Use the correct user context in CustomTile" into rvc-dev am: f482c100 am: 197e9c2a am: 42b3d3aa -s ours
am skip reason: Change-Id I92b26294dec63477943d28e2000fe3e0c16f8aa3 with SHA-1 4ba3f9aa is in history
Change-Id: I96c4e012a37e9eafb85b1151d99a50fbefd8f978