Merge "[automerger skipped] Merge "DO NOT MERGE: Use status_bar_padding_top"...

Merge "[automerger skipped] Merge "DO NOT MERGE: Use status_bar_padding_top" into qt-qpr1-dev am: 27a0ee31 -s ours am: a12e7d94 am: 58fb33f4" into rvc-d1-dev-plus-aosp am: c81d8408 am: ee2e85be -s ours

am skip reason: subject contains skip directive

Change-Id: I251aadb098bfceff61f81d306fd6ffca918ca758