Merge "Fix restart icon size and margins" into tm-qpr-dev am: f04c1399 am: 31c1d000

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



Change-Id: I141d1d8a1266e238395e83b64538e839df877f93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>