Merge "Merge "Fix overlap between notifications and lock icon in portrait shade" into udc-dev am: 674a19a2d3 am: 12b2a2c745 am: 376518d0a6" into udc-qpr-dev-plus-aosp am: 02e165916a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23589950 Change-Id: I1a775041012219c2526f413923d560f2b028ecac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: