Merge "Fix clipping of SecondaryLabel on animation" into sc-dev am: b2a201b7 am: 0e16422e am: 76c33ae4

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

Change-Id: Icf2aca59112b9b1f48c2ec2efb6932cfe2fca80f