Merge "Fix improperly terminated <em> in night mode method Javadocs" into main am: 46160a9f

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



Change-Id: If787b35a5455da4351549b6168aa8aa2aacce2ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>