tree 2b6c6d9a8b7f1434292cd4f6dec86cc43b00d450
parent 853504c5243bbc2f9318b8e6acaf9bc2449315d9
author Lorenzo Colitti <lorenzo@google.com> 1610379284 +0900
committer Lorenzo Colitti <lorenzo@google.com> 1611830640 +0900

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