[automerger skipped] Merge "Revert "access system resources with android.R...
[automerger skipped] Merge "Revert "access system resources with android.R package"" am: 6bd382b8 am: 4644c7f0 -s ours am: da12a74e -s ours
am skip reason: Change-Id Ia2b1fd28dee08da03b6f1e7892ac3562edad00e4 with SHA-1 3e26fc0f is in history
Change-Id: I9e1af8959b36d2721d60b7176ad62a52cc1d1b4a