[automerger skipped] Merge "Convert core/tests/featureflagtests/Android.mk file to Android.bp" am: 2e96d3f554 am: 8b788b2194 -s ours
am: b37e639872 -s ours
am skip reason: change_id If3f574bc15dedcd7880be605667297d257175c8d with SHA1 89eaa93af9 is in history

Change-Id: Id9578c9576d6eeb886cce16a78d4d60769787528