Commit 14f98ff8 authored Oct 12, 2020 by Mark Chien Committed by Automerger Merge Worker Oct 12, 2020

[automerger skipped] Merge changes I60ed5465,I70b49d0a into mainline-prod am: 4c4f42a7 -s ours

am skip reason: Change-Id Iddc5304730dce7b11c5d124b7eddce057d752bbd with SHA-1 6626f7bc is in history

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

Change-Id: Ia95b27c0ce749a9f7cab5cba532fde873bf44cb0

There are no changes