Merge "Remove deprecated unenforced permission from manifest." am: 4f9933a6dc

Change-Id: I7abc327abade36e768872a991dd504ff5355971b