Merge "Add base class for OptionsBuilder and PresenceBuilder" am: 3d37ba8a37 am: e0e8b01154

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

Change-Id: If781656e549338c9c4eb4ce1a9edcbe83213330f