Merge changes I12c7de63,I241cf0fc into sc-dev am: 56dac4ccf4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35f94df03e77345998a14622d08d993e8006e98e