Merge "Expose adhoc conference calling API as public." am: 8ebbe3c038 am: fb8f41f0c2

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

Change-Id: Ia5e17f2dbbfbb539f2415348e1ddb960354d3662