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

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

Change-Id: I815e57868a205d9700e2db4a448d9ab6c8af5105