Merge "API: Enable UnhiddenSystemApi check for frameworks/base" am: 94becc7b4f
am: 520253e06c

Change-Id: I545af534c170a68080b0a6150fc486d702ed3aff