Merge "Update the text size for collapsedTextAppearance" into sc-dev am: 0b401758 am: f4a4d61d am: 724743a4

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

Change-Id: I408e22d37ce1d04f57a51af0844d488e464012e6