Merge "Reverse ReferenceWithHistory.dump() order" am: a1afeb6910 am: e9736ffc78

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

Change-Id: If9a4f5881898c62e4e6cc7e87b1b30ef4bae2804