[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: 4ee64c74 -s ours am: 069e99a2 -s ours am: 6075d249 -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: I26f3466f9121d2287da1d519dd6bfd3f12c86dee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>