Merge "Fix registerListener documentation bug in which the notice does not contain the notice contents." am: e1ce0243a3

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

Change-Id: Ie1b3cbb261a8aea72a78ba1f6e916344848a1c23