[automerger skipped] Merge "[RRS] Activate investigation of screen_resolution...

[automerger skipped] Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev am: 1f7fab03 am: ef540c68 -s ours

am skip reason: Merged-In Ib4622490b0f63139b47f242ebcae916edf291cea with SHA-1 7087e5c4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19124855



Change-Id: I9792a751ac493ecf4435a19f129d5590bedc1752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>