aml_ext_331112010 (9161278,com.google.android.extservices)
Snap for 7478067 from 71596053e24b7f32b61360bc0f08a158a95cc485 to mainline-extservices-release

Change-Id: I8ea2f7667ed97d6734598eb1aa3f48f0ab279ba1