Merge "Convert Personal/Work tabs to rounded bubbles" into tm-dev am:...

Merge "Convert Personal/Work tabs to rounded bubbles" into tm-dev am: 5e35dcd3 am: 310590c9 am: d894553e am: 93d2ff28

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



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