Merge "Update framework from jetpack." into sc-dev am: 27b63bb150

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

Change-Id: I9d27f021839024271cad1c76dd07518e2c2cdd85