[automerger skipped] DO NOT MERGE: Fix alignment of share chips. am: 4d271f3d9a am: cf9d7da189 -s ours
am skip reason: subject contains skip directive

Change-Id: I001e1fb2bf234af60558a4c04a49f5c1dfdcb7bd