Merge "Merge "Fading in edit button much later" into rvc-dev am: addcaf9f...

Merge "Merge "Fading in edit button much later" into rvc-dev am: addcaf9f am: 108e9b1a am: d44f5b80" into rvc-qpr-dev-plus-aosp am: a97467c3

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

Change-Id: Icd2afd5fa1daf607bab4ce0c6f47a782810d531b