[automerger skipped] Merge "Update hidden API lists in AOSP" am: ddceca858f
am: a320e97d42  -s ours

Change-Id: Ib3ce6e2ac8bbff321039dd5262bc3a85bacc1bba