Merge "Fix android Studio build due to "@Subcomponent.Builder is missing...

Merge "Fix android Studio build due to  "@Subcomponent.Builder is missing setters"" into sc-v2-dev am: 7225f45e am: e03e8326

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

Change-Id: I290c8f1e6d19e5a3b44c3cdaf38c0e0b1bb0f4be