[automerger skipped] Merge "Add another OptionsBuilder constructor with the source type as one of its parameter." am: 8c702c2d6a am: 82d57ec5ab -s ours
am skip reason: Merged-In I74c69800125f8c4a243e80ed47c5134eda8d5a78 with SHA-1 2c2ae55759 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1714113
Change-Id: I4338aa54b3e6a8e1c6e35b209c0dce1720fbbe09
This commit is contained in: