Merge "Merge "Prepare for flexible system bars" into rvc-dev am: beb2f1f9...
Merge "Merge "Prepare for flexible system bars" into rvc-dev am: beb2f1f9 am: a966dedc" into rvc-d1-dev-plus-aosp am: 87f7445f
Change-Id: If3e60c13527a65d83c0fbb3d0bf6be17b11ed63a