Merge "Fix bug in aggressive layer cache purging" into master-skia

https://skia.googlesource.com/skia/+/225a627ccb15f41efa40750f4244283ef7e8fbf0

Change-Id: I0cd99d75cc8fe0209bdfd89dce8b88c4bc974409