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: Ic1c9bddbfb6d3695dfed08dd0e273b1de915fc85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>