Merge "Derestrict Resources.getDisplayAdjustments()." am: ea01ff86d0 am: e48c5194db

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idebdb5ee7a25eabc83e7d9486384bfc4877c90fa