Update trunk_staging aconfig flags

This represents v/g/r commit 9c6d57b36527ec6f2b54369048145ef8ea3b725b

Bug: 339672075
Bug: 328495189
Test: manual
Ignore-AOSP-First: not for aosp at this time
Change-Id: Ide64c4233f62276c76f9cdb512c9cb7de9d4618a
21 files changed