Merge "Fix IDENTIFIER_TYPE_HD_STATION_ID_EXT javadoc typo" into udc-qpr-dev am: 14e73221

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



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