Merge "Removed extraneous comment delimiter from the...

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

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



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