Merge "Use sp for screenshot button icon size" into sc-dev am: 0ecbcfd0 am:...

Merge "Use sp for screenshot button icon size" into sc-dev am: 0ecbcfd0 am: 07a797e7 am: c1599d4d

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

Change-Id: I5b4e00e6a3ab433f150640138d682af2f0eb8711