Bug: 321163306 Test: manual - on App Info Test: unit test Change-Id: I36f6a479d530fc646a55f68fbaf681b72eff00dd