DO NOT MERGE revert system api loadSafeLabel

Bug: 28557603
Change-Id: Ib2dd0fc19217655a4d6b49cdf49ce36dfd6577d5
2 files changed