[automerger skipped] Merge "Add edgeEffectType attribute and type property"...

[automerger skipped] Merge "Add edgeEffectType attribute and type property" into sc-dev am: 0177fad8 -s ours

am skip reason: Change-Id I16f20b36d9a15c08e0a37f98572ef9c9f8fbc88f with SHA-1 8a255b67 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I175e1f0056216a5f611e03f0544e9c72946eee69