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

Change-Id: I16748ffcb2ac58bb0865d2061bb0d8f5d7496da1