Merge changes from topic "flexible_bars" into rvc-qpr-dev am: a5404a59 am: 6b03df08

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

Change-Id: I9cd0a0394aa1c156d7705c1a93f774b3a453d536