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

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



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