Android mainline 12.0.0 release 18
Snap for 7727353 from 10bea512a7ca7cca7f4f334e69b03cc11870f2af to mainline-tethering-release

Change-Id: Ic2038c77ed1e2ef29b4ce06b5e03e48cbe6b7a77