Merge "Convert core/tests/privacytests/Android.mk file to Android.bp" am: 523e0b08f2 am: ada6328275

Change-Id: Ia49cd94cc0b712770728c8852ef51be3eb7f050f