[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "revert-13350963-blur_system_api-AFRJFBKNBA-sc-dev" into sc-dev am: e6ae6e32 -s ours

am skip reason: Change-Id If8c915c716dacf3319974eaf118e10f323538c4b with SHA-1 4313ee94 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I090b7ef1dfcf5bbcf3178568e2bb9fe178b2d83a