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

Change-Id: I39c995ce17c248df130a392d8388170d32f7b7dd