[automerger skipped] SetDataEnabled indicate calling package am: 967c10b1...

[automerger skipped] SetDataEnabled indicate calling package am: 967c10b1 am: 04470f4d -s ours am: 2ee623fb -s ours am: 30d90f4c -s ours

am skip reason: Merged-In I769437e9332f27c0990c37f60ad6d9db284e86cf with SHA-1 ac94df2b is already in history

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



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