Merge "Merge "Do not proguard com.android.systemui.log" into udc-dev am:...

Merge "Merge "Do not proguard com.android.systemui.log" into udc-dev am: 2e2e1ca6 am: bd1dd096 am: f7e7ec8a" into udc-qpr-dev-plus-aosp am: e56c5e4e

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



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