Merge "Merge "Don't truncate an app's own label when forcing safe label." into...
Merge "Merge "Don't truncate an app's own label when forcing safe label." into rvc-dev am: 2f988b5a am: a98609c3" into rvc-d1-dev-plus-aosp am: 95e89068
Change-Id: I99913fa30f85b2fbd2d3226f6d4f60c0aa719539