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

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

Change-Id: Ie046dd362b2b0c91ce7dfa6faa02e0c6d1741bdc