Merge "Fix TelephonyRegistry's mListenLog." am: eedc45be11 am: 00a9ff1f7c am: 0e5fbd9fa3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I828c1d0e4cc98137a35a8ea66074e804f9225f53