Merge "Improve SimPhonebookContract javadocs and qualifiers" am: e738f2f211 am: 77c1d68aa4

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

Change-Id: I4a9c6acecc370e72a28f9ce09f16c2de3f0ea948