Fix bad merge of aosp/1220298

Bug: 158872011
Test: atest
Change-Id: Ife92d607df5442febab86ed61c3edc24d904b36b
1 file changed