Merge "Moving hover state status bar adjustments down to 600dp" into...

Merge "Moving hover state status bar adjustments down to 600dp" into udc-qpr-dev am: d0d5e848 am: 282d815d

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



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