Merge "Add unit test for testFilterEmergencyNumbersByCategories" am: b579a785bd am: e82edd8f37

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd7cc59c3132307555defc2acadc67d5d411637d