Merge "Fix Squiggly line inconsistency." into tm-qpr-dev am: 43c7da8e

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



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