Fix UnsupportedAppUsage property serialization am: 9ccea1da79
am: df40c286a0

Change-Id: Ie3448793608850a37eed1ccc0cfb1c252908f866