Merge "Manual overwrite @removed for genereated builder apis." into sc-dev am:...

Merge "Manual overwrite @removed for genereated builder apis." into sc-dev am: c449e23d am: 37f19050 am: 52a51114

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

Change-Id: Ibb8d8a4cce006bc93cb1429dc41692fe21581084