Merge "Support Library v23.2.0 API Diff BUG=26448279" into mnc-docs
am: c7775d017c

* commit 'c7775d017cbd4cd431435a0c213f8ab54e643053':
  Support Library v23.2.0 API Diff BUG=26448279