Merge "Restored style icons and added screen shot icon overlays" into rvc-d1-dev am: b1915af310

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

Change-Id: I8cc19e849adb63174a8540bd8b83552fe15b2981