Merge "Convert core/tests/privacytests/Android.mk file to Android.bp"