Merge "Set default hidden API policy to dark+black"
am: 6c99dc805a

Change-Id: Iee80335d0af86b031cf5afbdfbb24d9e04978928