[automerger skipped] Merge "[DO NOT MERGE] Update to use new res status bar...

[automerger skipped] Merge "[DO NOT MERGE] Update to use new res status bar height dimen" into sc-v2-dev am: 2f582783 am: c0d749ed -s ours am: 08cc1049 -s ours am: d26a311a -s ours

am skip reason: subject contains skip directive

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



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