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