Merge "Switches ADAS allowlist away from string resources" into tm-dev am: c96bd77dd1 am: 6655fdab6e am: bccec0e865
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17425852 Change-Id: I1060dc1f57d3f4ebbfa4e490ba9fa7f26ea8eebc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: