Merge "Hide required underlying caps APIs" am: d4b7104f7b am: ead4d8c3b4

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

Change-Id: I9553f0fcff08432531261cb7bd252eff33f71b11