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

Change-Id: I7042e8087afd27fdd25871de065d54d2b81177d8