[automerger skipped] locksettings: Don't use AIDL V1 weaver am: 0ed52ac404 am: 97ea5b201f -s ours am: 153b833b08 -s ours am: 7315f66b23 -s ours

am skip reason: Merged-In I32306fb8473c655e68d89d63a1e4f00c8bb5d61f with SHA-1 456cd05c7e is already in history

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

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