[automerger skipped] Don't blur too many layers am: af0c7fd7 -s ours

am skip reason: Merged-In Ie7195eb852b52aff2f58da8bd095d8684baceef6 with SHA-1 c01af289 is already in history

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



Change-Id: I04dfa49efe2dbcc4071b9c4f28bd838667be4474
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>