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: 6e8cf498 am: f52fb2c4

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

Change-Id: I78d24b8cf9656cfcec59abbeaacc2f008539862f