[automerger skipped] Merge changes from topic "dm-profile-validation" into...

[automerger skipped] Merge changes from topic "dm-profile-validation" into main am: 7e72104d am: f0643a6b am: b16d9905 am: 028f33fd am: 9e337f9b -s ours

am skip reason: Merged-In I3e2a0f897bc9c2d9d1b7e52d9479c852ca4f5fe7 with SHA-1 bd37d28b is already in history

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



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