Merge "Fix dot/icon overlap in notification shelf" into tm-qpr-dev am: a745ebf3 am: 9a2e232c

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



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