Merge "Merge "Align outer edge of profile tabs and icons" into tm-dev am:...

Merge "Merge "Align outer edge of profile tabs and icons" into tm-dev am: 4a191d7f am: 6984fa2c am: 14a2cdba" into tm-qpr-dev-plus-aosp am: ffb051bb

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



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