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

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

Change-Id: Iff381892048ab02b6df2d92dc8d2c687b9f7bc88