Merge "Update the text size for collapsedTextAppearance" into sc-dev am: 0b401758 am: b75e799c am: 53da7314

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

Change-Id: I47deac74d7ae97aeb960aa1db02ba5e402fcc1d7