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

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

Change-Id: I2c5b7808b7c43788f85c9360fc1b65f779655a42