Merge "Control hidden API toast with a system property" am: 13020490be am: a9b3f91828
am: 1e1c4fc802

Change-Id: I0b2d898dbdac8ed6ac8995bab521b62adb5d0f2e