Merge "AAPT2: Allow <uses-permission-sdk-23> in manifest" into oc-dev am: 0d11c91d9e
am: 25b63c7bb8

Change-Id: Ie5007172fbae69263a1c60106ad8722f5388ae4e