Merge "replace CURRENT_OR_SELF with non hidden API" am: 896b6e9158

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

Change-Id: Ifc1264ccc312618f0ac22700fcf947dd24c16cdd
tree: fd3398c14810ed9148a08e78c07db67a06ab9817
  1. framework/
  2. service/