Merge "Fix Periodic Adv method in jni" am: bc29cf9e9f
am: 49a3c85a43

Change-Id: I37c16d0bb63004aff0250d468e593035d598c54f