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

Change-Id: I066c4422eb1ae87f0e5943063201466756b3891e