Merge "Update template tile to fit worse-case dimens" into sc-dev am: 6df2318f26 am: 9167eca503

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15029951

Change-Id: Ib797a6e522aa57645a108f052dadf001cdeb3612