Merge pull request #11411 from t895/managed-device-update Android: Update managed device for baseline profile generation
