Merge "Pass whether the local device is an atv device to the native layer to...

Merge "Pass whether the local device is an atv device to the native layer to determine whether to include pairing dialogs for justworks and encryption only LE pairing" into oc-dev