Merge "Fix typo in Context#registerDeviceIdChangeListener documentation" into udc-dev am: 67f0bb43a2 am: 002a249de0

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

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