Merge "Do not rename R.java package" into rvc-dev am: 5c8dd641ba am: 8adfcbc783

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11397254

Change-Id: Icfb3b72ecf029a1b6029b91bd5c2e3f49ee71ff1