Android 11.0.0 release 31
RESTRICT AUTOMERGE Use the Kati stamp to include makefile dependencies. am: dba92766b7 am: ac43c7d853

Change-Id: I3e4f67789cf715caf4be62863c4ce5f09cccb1fb