Merge "Fix restart icon size and margins" into tm-qpr-dev am: f04c13997b

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

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