[automerger skipped] Merge "Forward device updates when info changes" into...

[automerger skipped] Merge "Forward device updates when info changes" into tm-dev am: a2b34c4c am: 035386f4 -s ours

am skip reason: Merged-In Iefd7ce0e8859b89db2bc75c243b3a04a0cb3915d with SHA-1 4c8144ee is already in history

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



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