Merge changes from topic "am-015983a8e68c40518b3338e5bafeb46a" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes from topic "cherrypicker-L34800000954905788:N57900001270872696" into tm-dev am: 52f0fe0c47 am: 3ac6da7e42 -s ours
  [automerger skipped] Add deny firewall chain for OEM am: 9cd4726890 am: c06744de9c -s ours