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

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

Change-Id: I4744802196afc856eb81ac830c51c2af923e0727