Merge "replace CURRENT_OR_SELF with non hidden API" am: 9c2d1e673f am: 8ae74e0055 am: 8fb184fe76

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

Change-Id: I950e56ed6f2d8c2b6252a1df5136ccaa7d63ef21