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