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

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

Change-Id: I1be090c4b72b1dfc967efbea0f40be965d346565