Merge "Fix wifi QR decorator not rendering" into udc-dev am: f8f3ecfb am:...

Merge "Fix wifi QR decorator not rendering" into udc-dev am: f8f3ecfb am: 8927b929 am: d73a9353

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



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