[automerger skipped] Set device type on first message received am: 888ee5be...

[automerger skipped] Set device type on first message received am: 888ee5be am: 9ae53810 am: ca6ded02 -s ours am: d66807e3 -s ours am: 7d370f24 -s ours am: f392272b -s ours

am skip reason: Merged-In I66b0969347e7d292f8222efb250156e0421e60ca with SHA-1 6304e44d is already in history

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



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