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