Merge changes from topic "presubmit-am-c762bda6d9d74477b7e7c4bed647a510-sc-qpr1-dev-sc-dev" into sc-qpr1-dev am: aacd20af8b am: bd8961c4ad am: ffa4655cd4 am: e6fb93a0d1 am: 8b10f9888c am: 0e35b02166

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

Change-Id: I1b3d9955630db1ecfd4d588fe3ed5950fc7cd70e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>