set targetSDK to 31 Bug: 188696815 Bug: 190679991 Test: Manual test by installing apx on R and S ROM Change-Id: I21422fdb537f61f829143a4cdfaa309bd58ba9d9