[automerger skipped] Polishing for migration to disable Weaver am: 7504b7b0 -s ours

am skip reason: Merged-In If05d11a0a884294896223aedd79d7f689380dc58 with SHA-1 06f58c06 is already in history

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



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