Merge "Update local device info" into udc-dev am: 3e7b20e500 am: 21c6adf922

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

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