Merge "Remove the system-api-stubs-docs target" am: d0fb632e4b am: cca63b3099

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

Change-Id: I17702d355bf1df961cb1b65332a83eb183567f5f