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

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



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