This reverts commit fe5d901d198789b4e59cd9008d330200580dfc32.
As API level isn't changed to 31 yet, the change would break
groups. Revert the change until API level changes to 31.

Change-Id: I79e4d748d33c08db77b8800b47d53a182271a37a