Merge "Add another OptionsBuilder constructor with the source type as one of its parameter." into sc-dev am: 9e181393 am: 00258eb7 am: dc8fbdc6

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

Change-Id: I64c7438aa89add765a6c40d702527962afe0acdc