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

Change-Id: Ib390fd568e4a5d71cdceec3a84b0d55e02b9c45d