Merge "Refine the IllustrationPreference." into sc-dev am: 39ee79bd8a

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

Change-Id: I1b3a0f6b209f35da23febcb4068e4c5f694d483c