Merge changes from topic "dm-profile-validation" into main am: 7e72104d7d am: f0643a6bcb

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

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