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

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

Change-Id: I589051346f525456024b13810c779502dd62c913