[automerger skipped] Merge "Prevent NPE in CustomTile" into rvc-dev am: c8bb1b3286 am: eed6a477c9 am: e25599c34b -s ours am: 1cdfff2599 -s ours
am skip reason: Change-Id I0ee11806c0047e0e524f5201d369bee51beba451 with SHA-1 2648a2a99a is in history
Change-Id: Ibf3168b310de6ca2394b13efda5a202c3942cb19
This commit is contained in: