Merge "Add <p> to UnsupportedAppUsage javadoc." am: dfd7bc77c3 am: 5e99817407
am: 413ad6c727

Change-Id: I902de139a0a5508b1128fdd64274775c70225e6e