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

[automerger skipped] Merge "Forward device updates when info changes" into tm-qpr-dev am: 9e7c7603 am: 8c783e9c -s ours

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

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



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