Commit 1b625091 authored Oct 10, 2020 by Jeffrey Huang Committed by Automerger Merge Worker Oct 10, 2020

[automerger skipped] Merge changes Ife0b17c2,If37e5c6c into mainline-prod am: 99755375 -s ours

am skip reason: Change-Id Ife0b17c281984fc489ef46039cbf5aa7b1346bdb with SHA-1 f9dadfd0 is in history

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

Change-Id: I4168100b02faed12f225e2f94e9d980c73d0dfc3

There are no changes