Merge branch 'common-android15-6.6' into common-android15-6.6-desktop

Bug: 407967342
Change-Id: Ia7a2102aef4388a123c2b8c803e82bd7244be286
Signed-off-by: Slawomir Rosek <srosek@google.com>
tree: 1505633cad4b5c425baa9405b36069a955aa51e1
  1. default.xml