Merge "Remove api-stubs-docs" am: 8cddd53381 am: 4ef05f5c6c

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

Change-Id: I19ec72d9f2e6f807be43f36587862b07cae0c530