Merge "Add unit test for testFilterEmergencyNumbersByCategories" am: b579a785bd

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1535283

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee98d06647181da3a6d273877a3182e2cc1a4d17