Merge "Stop hiding ReferencesHidden" am: f8b10053f1

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

Change-Id: Ia787751f1eda3a94ffde74d1c89e88867e34fd61