Merge "Consolidate the starting surface icon size to framework" into sc-dev...

Merge "Consolidate the starting surface icon size to framework" into sc-dev am: a7fb25ba am: c59c9c66 am: f3c2bead

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

Change-Id: Ia1abfdf0991f1923586b546b45c17c606dda98af