platform/frameworks/base/ - S is now 31

Bug: 171506470
Test: Build
Change-Id: I46d4df5f27783a96a58c966b113391ea3bc112cb

tools/aapt2/SdkConstants.cpp

@@ -58,7 +58,8 @@ static const std::vector<std::pair<uint16_t, ApiVersion>> sAttrIdMap = {
     {0x056d, SDK_O_MR1},
     {0x0586, SDK_P},
     {0x0606, SDK_Q},
-    {0x0617, SDK_R},
+    {0x0616, SDK_R},
+    {0x064b, SDK_S},
 };
 
 static bool less_entry_id(const std::pair<uint16_t, ApiVersion>& p, uint16_t entryId) {

tools/aapt2/SdkConstants.h

@@ -56,6 +56,7 @@ enum : ApiVersion {
   SDK_P = 28,
   SDK_Q = 29,
   SDK_R = 30,
+  SDK_S = 31,
 };
 
 ApiVersion FindAttributeSdkLevel(const ResourceId& id);