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

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

Change-Id: I34e3c8d5e8b89ca9f27ea43d3f3331d5bf6ead14