[automerger skipped] Merge "Fix IDENTIFIER_TYPE_HD_STATION_ID_EXT javadoc...

[automerger skipped] Merge "Fix IDENTIFIER_TYPE_HD_STATION_ID_EXT javadoc typo" into udc-qpr-dev am: 14e73221 am: 2bb41e37 -s ours

am skip reason: Merged-In Ibbf789889aed57c18f6f7d21736c838a3d069d5b with SHA-1 f47e45d3 is already in history

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



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