Test: unit test; cts
Bug: 173437870
Change-Id: I2af39eea48737df1bf629caea5b617736635f2aa
Merged-In: I2af39eea48737df1bf629caea5b617736635f2aa
(cherry picked from commit 36b3dbc3ab)
Test: unit test; cts
Bug: 173437870
Change-Id: I2af39eea48737df1bf629caea5b617736635f2aa
Merged-In: I2af39eea48737df1bf629caea5b617736635f2aa
(cherry picked from commit 36b3dbc3ab)