[automerger skipped] Pre-cache filter results am: 0192f737 am: 182b5f23...

[automerger skipped] Pre-cache filter results am: 0192f737 am: 182b5f23 am: 1389bda8 am: 7a2c4b77 -s ours

am skip reason: Change-Id I6e0446068f46af0f22e0259ab7b6cdbbc7e08a22 with SHA-1 2377f33a is in history

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

Change-Id: Ie8fb6f9428d830ac0052b52614189ff20a38c923