Merge "Revert "Deduct padding from widget size only if padding has been inset"" into sc-dev am: 2af9d27116 am: d352253c2d am: 78d86fa685

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15026671

Change-Id: I3b77cbcc85fcf47074e242b55fb493452446414b