Merge the android-9.0.0_r60 release tag
Android 9.0.0 release 60

* tag 'android-9.0.0_r60':
  Check data consistency in mdls parsing

Change-Id: Iaf7b0b53b0e8a737816cd57230054418aa94f1a6