bug: 71715828 Test: Manually tested, added robolectric test Change-Id: Ide18c94f52fe896aee0636ef702cd808b7d88638