Merge "Tests for mixed dataChanged case" into udc-dev am: 8f60f998

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/22850600



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