Merge "[Regulatory Labels] Load labels from overlays" into udc-d1-dev am: fe38ff963a
am: 1806b3032f
am: d9e7141a78
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23939155 Change-Id: Ic08377495eb547dfe53e787c53e926409ba22788 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: