Merge "AOD - Notif icon location" into sc-v2-dev am: e2e1314e0e am: 103011cabf

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

Change-Id: Ief6846f20b892543195630a6d7dea5ab9430e703