[automerger skipped] Merge "Status Bar - Wrap visible content in containers" into tm-qpr-dev am: 59bf347867 am: e1ee115dff -s ours

am skip reason: Merged-In I07f7a8f4e362b8f4cb32fc196ee1c011498435f7 with SHA-1 3582fcdef0 is already in history

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

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