Bug: 292036686 Test: manual - on All Apps Test: unit test Change-Id: Id5069b8172191f3277b825f82407551f6eb4e202