Android 6.0.1 release 12
Merge "Avoiding flush on-change sensors at subscription" into mnc-dr-dev