Android 11.0.0 release 27
Add missing return statement am: 33b69620be am: 659118df8a

Change-Id: I9a2e27f426c8319e01c97d27c0632804bcc7473a