aml_sdk_331310010 (9319133,com.google.android.sdkext)
Merge cherrypicks of [20535007] into sparse-9271891-L56300000957454538.

Change-Id: I6f08335df9341603355f1496f1ac4c5096bf8bc8