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

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

Change-Id: Ie318c734d41d8b671de4c6bd6d55ca3c8bbb8dea