Merge "Hide required underlying caps APIs" am: d4b7104f7b

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

Change-Id: I46abe41479e04688a45e72de5ce4d77882057ef1