[automerger skipped] Merge changes from topic "move-inflate-ss-to-cc" am:...

[automerger skipped] Merge changes from topic "move-inflate-ss-to-cc" am: 922e9bfd am: 1e14220d -s ours am: 3ae0c9d3 -s ours am: 9830b28d -s ours am: 3e68813d -s ours

am skip reason: Change-Id I494cb93a2c72ff3df2ef45ad737c5606132e32d1 with SHA-1 7dcda7d6 is in history

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

Change-Id: I62221a113769f364843d5e986b7ad8b87a27bb5c