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

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

Change-Id: Ifc1264ccc312618f0ac22700fcf947dd24c16cdd