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

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

Change-Id: I2c10282480e25322dd8c6d404fda286801c24782