Android 10.0.0 Release 8 (QD1A.190821.011)
Merge "Fix LOCAL_MODULE_CLASS." am: 7467a54e29 am: d92d484537
am: 32bd8bb174

Change-Id: I8d082094761b91f2efeb1494f2c8b286cac9501e