Merge changes from topic "flexible_bars" into rvc-qpr-dev am: a5404a59f2

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

Change-Id: I7bee21bde74fe82d89e050d48dada44b080ce244