Merge "Reverse ReferenceWithHistory.dump() order" am: a1afeb6910 am: e9736ffc78 am: 0900501df3 am: 6a62ae131a

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

Change-Id: Iad3f9d21a8037c51d701ae23856f7c25ac9429d3