tree 76082fe06c0f187f38e2689e34556459018579f6
parent dbdc57870f03266af00a54d4491c9a7e51055986
parent c4cd8ed446dbde39df701dab0525e5ef5b9824ec
author Branden Archer <brarcher@google.com> 1562205015 -0700
committer android-build-merger <android-build-merger@google.com> 1562205015 -0700

[automerger skipped] Relax testing under GSI
am: c4cd8ed446 -s ours
am skip reason: change_id Ie52e916a658b09eea66ffd9c5f2ac704656f4f3f with SHA1 dbdc57870f is in history

Change-Id: I8271eff16ebf11cd68807bd627fd70a4cf189766