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

Change-Id: Iac1fdeff968b131e8f3486060dfb7cdeed446157