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

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



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