Merge changes from topic "dm-profile-validation" into main am: 7e72104d am:...

Merge changes from topic "dm-profile-validation" into main am: 7e72104d am: f0643a6b am: b16d9905

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



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