[automerger skipped] locksettings: Don't use AIDL V1 weaver am: 3e8eacc1 -s ours

am skip reason: Merged-In I32306fb8473c655e68d89d63a1e4f00c8bb5d61f with SHA-1 048aaf42 is already in history

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



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