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