Android mainline 12.0.0 release 18
Snap for 7550844 from 587b7b4ef87b561e4f303b98b4e254f32eefa152 to mainline-tethering-release

Change-Id: I6b056075355097df59ebd8f2fbb6b4c1a19c8677