Merge "Removed extraneous comment delimiter from the...

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

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



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