Merge "Removed extraneous comment delimiter from the...

Merge "Removed extraneous comment delimiter from the getDefaultFocusHighlightEnabled method." into tm-dev am: f4adad36 am: 2f84bab7

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



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