[automerger skipped] Merge "mMaximumObscuringOpacityForTouch should remain...

[automerger skipped] Merge "mMaximumObscuringOpacityForTouch should remain valid" into tm-qpr-dev am: 44e16010 am: 7e633df3 -s ours am: 13f1b02e -s ours am: 478ac0b6 -s ours

am skip reason: Merged-In I4f15a7573913b503635995d26053bed9aa753a45 with SHA-1 bda5ee8c is already in history

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



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