Merge "Bump API level required for const-method-{handle,type}" am: a5da5b9d92
am: e8092c184f

Change-Id: Iec4154fc9278c359a73f4b09e24acf18a64eff41