Android mainline 12.0.0 release 9
Snap for 7679530 from 11e9c5dd9c6911df7f03fc7a00a654e8aeb9d063 to mainline-extservices-release

Change-Id: I0504aebb6057e8714a7aaadb244d2a44280abc73