Merge changes from topic "icon_sp" into udc-qpr-dev am: 2befc231

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



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