Merge "Add missing </pre> to Javadoc" am: 076fb5e987 am: d084c0202a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1905490

Change-Id: I0dfcbf12f73733995f13ce67f820d9ca0e7d3215