Merge "Fading in edit button much later" into rvc-dev am: addcaf9f am: 2b3c5916 am: 179256af am: 7ef6a125

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

Change-Id: I167df04aa5244ae3a08f20ca1d93493c04c148c5