[automerger skipped] Merge "Fix nine-patches to always filter" into...

[automerger skipped] Merge "Fix nine-patches to always filter" into rvc-qpr-dev am: c1665ffb -s ours am: e7aa8a61 -s ours

am skip reason: Change-Id I8153f1d6ecd850953369dd664da88915c3842bb5 with SHA-1 0e540d05 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d4061186664038bc9b1b3936217e0c984ae0c9c