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

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

Change-Id: I67cb4f636ed17e8e3959fa39d9a28192fbed54de