Merge "Fix labels loading regression" into tm-qpr-dev am: ea523a0c am: 2df43628

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



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