Merge "Disable Android Beam"
am: f5e0370a0d

* commit 'f5e0370a0d6a52c0bc029ced4fcc0453bed2f7eb':
  Disable Android Beam