tree 072a51c8306491ddc4e500bdd0b762592dfbaec5
parent 2dd8b3451f65dff56eee9692027f4d2271fcff86
author Mark De Ruyter <markdr@google.com> 1578609311 -0800
committer Mark De Ruyter <markdr@google.com> 1578627941 -0800

Updated the UTs to match changes made in aosp/968252.

Bug: 147462211
Test: UT
Change-Id: Iceb308c4e27030262db720a97b50358c2906e8e0