[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 skip reason: Change-Id I16f5aaff99ad6d2b6813a75ddbb4c97beb7aa2d8 with SHA-1 6860353f is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia31a93d1fb6af8b811cd68173727daf60c573da5