Merge "Considering to mainline moudle to move some resource to v31" into sc-dev am: 673add4d am: 6c6da1e5 am: 52bb6acb

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

Change-Id: I8d3591b7bc9aa7a41ebf31372e2610a5b9ddfd93