Merge "Update framework from jetpack." into sc-v2-dev am: b7e36190f6 am: a0a14390db

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

Change-Id: I9615fb273aa27dd7cd4f474cfa67c0ed4044a310