Merge "Restored style icons and added screen shot icon overlays" into...

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

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

Change-Id: Ie7480ffb41798a4ee0c1960493204bf06087b1e6