tree d4df713dddb21f75e8b097500e50eef5b81ec167
parent 7b6707b4844afdc0cda74e1ed623d6a93693000c
author Lorenzo Colitti <lorenzo@google.com> 1610379284 +0900
committer android-build-team Robot <android-build-team-robot@google.com> 1612901951 +0000

Backport test coverage from aosp/1547496.

This test coverage is necessary to fix an upcoming bug in R.
Backport it from the change that added it. The non-test portion
of that change is not necessary in R because it fixes a
bug that was introduced in S.

Bug: 172870110
Test: accompanying unit test shows lots of bugs removed
Change-Id: If7eb8857474d8b4f774f5fa5db2a3112e85c9cae
Merged-In: Ibf376a6fa4b34d1c96f8506fa8abbb7595a8c272
(cherry picked from commit 55229beb747b9e7b8a0f392d855a1b3342df8646)