Merge "Camera2: Fix crash when app requesting intent has requested no permisions." am: 8a7f1ea8f8

Change-Id: I30334de9acc2c5619aa05923f49660dfca11e93c