[automerger skipped] Merge "Update dependent properties when deviceType is...

[automerger skipped] Merge "Update dependent properties when deviceType is updated" into main am: 716acde0 am: 776399cd -s ours

am skip reason: Merged-In I5f67bd24730c63473260ff8a630bbdc90325d375 with SHA-1 9ce4d9ff is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3237716



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