Merge "Update hidden API lists in AOSP"
am: ddceca858f

Change-Id: I6d76ae90828995e456d5907bb0ebe664e27528d0