Merge "Handle exceptions from #requestPermission()" into nyc-mr1-dev
am: eb7aad4d85

Change-Id: I93a790da4befac06d0d7585b3a9c2db6d3316e54