Import final sdk version 31 from build 7432250

Bug: 171506470
Test: m checkapi
Change-Id: I5d822c04512ec5582802b15134a47b637dd67b9b
296 files changed