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

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

Change-Id: I07322b28db18039fa19ba1f7ff1eeae88395bbac