Merge "Update Android Beam deprecated API description" am: 527b6de018 am: 8b855b16f3
am: 862152f8cd

Change-Id: I0ddd6f1bffc709ffe93e194cd38996758cf48484