Automated merge of MTK Keystone code for 2020_03_30 am: 02567000bb am: 1a824b3844

Change-Id: I206c31dedd6ee53bc8555b9932a58caf383ab2ee