Merge "Fix Configuration.diff documentation." am: f822fdf129 am: 1017b74861

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

Change-Id: Ib73d56621f5ba8f01917443a9aa1dd78812aa72c