Android 7.1.1 Release 31 (N4F26U)
Prevent concurrent extractions
am: d89431ead3

Change-Id: I8fe1f1aeb0d814aca58dbc9d35089377d8af0a9a