Merge "Update Android Beam deprecated API description"
am: 527b6de018

Change-Id: Icf9d876a705f4f10365c836d3e0c15f476ce113e