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

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

Change-Id: I6506c375ada2c09d9824b4318db22f187b9a1475