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

Change-Id: Iabed49bf8b188f201462c0aa3faa676fdccd516d