Merge "Add new API for new feature of display name." am: e43f70afc7 am: bacd6a4a11 am: 93e2d21187

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

Change-Id: I29c1a276e70e8d129a3741f7491557459ce35735