Merge "Add extra flag to ApplicationInfoFlags" into oc-dev am: 01d69aae3a
am: cd5bf857df

Change-Id: Ib6ec6f46cd95e1d9732ee0ed62b801722377fde0