Merge changes from topic "max_height_a11y_illustration" into sc-v2-dev am: c1fb8bb5d2 am: 9169cf654a

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

Change-Id: I3e8f63acf3bec27a0ac224e149175881e880ab6e