Merge "Add new UnsupportedAppUsage annotation as lib dependency." am: 938bc05883 am: 05057bd860

Change-Id: I88368905adc217e27b3e4ee238f3ee472925f80a