Merge "Convert core/tests/featureflagtests/Android.mk file to Android.bp"
am: 2e96d3f554

Change-Id: Ia8e12a04fb7fff08926734f042491bbea4a30f32