Fixes: 187524665 Test: Build using Android Studio 4.2 Change-Id: If43e09099d5077804d12c44b6c23ed4f81cbeff1
Change-Id: Ic3a788f6b06bf6477ab23b183fb8c76ae8870b6b