Merge "Split shade status bar: change height to match spec of 42dp" into tm-dev am: 6a2b312a am: e910f441

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

Change-Id: I0149b331686036c39e51777a5f6c735cb73819e0