Merge "Removed extraneous comment delimiter from the...

Merge "Removed extraneous comment delimiter from the getDefaultFocusHighlightEnabled method." into tm-dev am: f4adad36 am: 60864f19 am: c1d06f2f am: 30dae54e

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



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