[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: 1dd590d7 am: 5c4d360d -s ours am: 0838f746 -s ours

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

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



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