Merge "resolve merge conflicts of 8f21448a to sc-v2-dev" into sc-v2-dev am: 647c5d86 am: f9cfb008

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

Change-Id: I0e5d37ed164b3da23e3ee46f7855c486f61a1410