Merge "Removed extraneous comment delimiter from the...

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

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



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