[automerger skipped] Merge "overrideConfig API did not notify platform correctly" am: f378a4017c
am: 5f83ffa75d -s ours
am skip reason: change_id I0f9445dcc22d8383608191cf56630beb5c7b0726 with SHA1 bcaf40b3d7 is in history

Change-Id: I6707c074ece82e62fd971d371c2ee4b87e295b5c