[automerger skipped] Merge changes from topic "am-68be966eb69c42be9da64afcf97a48dc" into sc-dev am: 69d84551 -s ours

am skip reason: skip tag Change-Id I18d2cceafad633a95bd909b7f693d45e8a861bc9 with SHA-1 9bb8218d is already in history

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

Change-Id: Ief3b0adceee0e99b7dab9469998d54ea22a130f0