[automerger skipped] Merge "[DO NOT MERGE] Update to use new res status bar height dimen" into sc-v2-dev am: 2f5827830e am: c0d749ed90 -s ours am: 08cc104906 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17686875 Change-Id: I6c86cfae490ec56a8a9881e550573cc8fbb017ce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: