Merge "Make it clear that checking shouldShowPermissionRationale is recommended" into rvc-dev am: 8083336a am: 802f5b50 am: 6c9791f9 am: 135501a1

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

Change-Id: I7bc711a2f17805d11975d071195f1ee58d34271b

Merge "Merge "Make it clear that checking shouldShowPermissionRationale is recommended" into rvc-dev am: 8083336a am: 93f09fac am: 218504d8" into rvc-qpr-dev-plus-aosp am: 02def46b

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

Change-Id: Ifce9a7bbe8d9a44be2c4b26d4992bf63a75d0e24

Merge "Make it clear that checking shouldShowPermissionRationale is recommended" into rvc-dev am: 8083336a am: 93f09fac am: 6941c18c am: 34559cfb

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

Change-Id: Ib49299afce44d97087b7f090a09761dc06b8c072

Merge "Make it clear that checking shouldShowPermissionRationale is recommended" into rvc-dev am: 8083336a am: 802f5b50 am: 6c9791f9

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

Change-Id: I99e712ec6fe6497fabd8632e0b55c29899c0ac30

Merge "Merge "Make it clear that checking shouldShowPermissionRationale is recommended" into rvc-dev am: 8083336a am: 93f09fac am: 218504d8" into rvc-qpr-dev-plus-aosp

Merge "Make it clear that checking shouldShowPermissionRationale is recommended" into rvc-dev am: 8083336a am: 93f09fac am: 6941c18c

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

Change-Id: I42d731fc6e1d20625f0508b8717a2a194f192352

Merge "Make it clear that checking shouldShowPermissionRationale is recommended" into rvc-dev am: 8083336a am: 93f09fac am: 218504d8

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

Change-Id: I79bf10a0737b35180c354564d560d8c070d89efb

Merge "Make it clear that checking shouldShowPermissionRationale is recommended" into rvc-dev am: 8083336a am: 802f5b50

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

Change-Id: I84f6fe02549dba93617595717e2d93f6038ba7ef

Merge "Make it clear that checking shouldShowPermissionRationale is recommended" into rvc-dev am: 8083336a am: 93f09fac

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

Change-Id: I6b48c31b9b8a620c78c626808cbe22f8762737c7

Merge "Make it clear that checking shouldShowPermissionRationale is recommended" into rvc-dev am: 8083336a am: 93f09fac

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

Change-Id: I71ceeb8840ba0bc8aa92a8e4db9fe17a6b3e2245

Merge "Make it clear that checking shouldShowPermissionRationale is recommended" into rvc-dev am: 8083336a

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

Change-Id: Ieb4c0a463493723fab5f344ae6d80cfaad138e08

Merge "Make it clear that checking shouldShowPermissionRationale is recommended" into rvc-dev am: 8083336a

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

Change-Id: I3b86d4957f0cdd609575b54ec27d1ae576da421d

Merge "Fix missing icon for one-to-one convos" into rvc-dev am: 05e10b59 am: ce90e803 am: dedaea4d am: 27a4d638

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

Change-Id: Ia6e24188adb45346b5f9e5830c49a8d43e950be8

Merge "Fix missing icon for one-to-one convos" into rvc-dev am: 05e10b59 am: eec7f123 am: 8105fe13 am: efd7b856

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

Change-Id: Ib65dc82d33fed40b22a9bf1eb2e47174b88c03ec

Merge "Fix missing icon for one-to-one convos" into rvc-dev am: 05e10b59 am: ce90e803 am: 1557f3e0 am: 454e0f21

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

Change-Id: Ied6eaf76018356f682c495c96ef1b279a927e463

Merge "Fix missing icon for one-to-one convos" into rvc-dev am: 05e10b59 am: ce90e803 am: dedaea4d

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

Change-Id: I1fb18dc69616876140b779b208ef2fb48a9a3d50

Merge "Fix missing icon for one-to-one convos" into rvc-dev am: 05e10b59 am: eec7f123 am: 8105fe13

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

Change-Id: I349486fe5d90f7a5a4f87a72d13dad62009c47f3

Merge "Fix missing icon for one-to-one convos" into rvc-dev am: 05e10b59 am: ce90e803 am: 1557f3e0

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

Change-Id: I3f78ad497da5dea05a405782c3a267aa73f6fe99

Merge "Merge "Correctly offset app op history on reboot" into rvc-dev am: 0ce4fba3 am: 2d56a156 am: 219316d7" into rvc-qpr-dev-plus-aosp am: 4d67aaec

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

Change-Id: I01a830e46b36ae7c773bce2a3ec8d80b1920d389

Merge "Merge "Correctly offset app op history on reboot" into rvc-dev am: 0ce4fba3 am: d9f92e46 am: 810612fb" into rvc-qpr-dev-plus-aosp am: 81b21094

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

Change-Id: I18e4d6cfca46c56e505e28e597ca191943007365

Merge "Correctly offset app op history on reboot" into rvc-dev am: 0ce4fba3 am: d9f92e46 am: deb79777 am: 2191f1c2

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

Change-Id: I4405ec52394c0093d0f37da512e5a2fd827a4e1b

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

Change-Id: Ic05e9a4772f39702df3742a0402b87f20fa4b616

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

Change-Id: Ic3f5aba0428e22e1124b2f7f1cc76b803e7202dd

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

Change-Id: I1d93efacf55222a5f6c1ed2727d007593ad68e0e

Merge "Merge "Correctly offset app op history on reboot" into rvc-dev am: 0ce4fba3 am: 2d56a156 am: 219316d7" into rvc-qpr-dev-plus-aosp

Merge "Correctly offset app op history on reboot" into rvc-dev am: 0ce4fba3 am: 2d56a156 am: 219316d7

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

Change-Id: If781f3255db49239c3ce193a72c5acc99d57aba1

Merge "Merge "Correctly offset app op history on reboot" into rvc-dev am: 0ce4fba3 am: d9f92e46 am: 810612fb" into rvc-qpr-dev-plus-aosp

Merge "Correctly offset app op history on reboot" into rvc-dev am: 0ce4fba3 am: d9f92e46 am: 810612fb

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

Change-Id: Ie12978da672963347278cfbb5d95e3b346866528

Merge "Correctly offset app op history on reboot" into rvc-dev am: 0ce4fba3 am: d9f92e46 am: deb79777

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

Change-Id: I9f3ce26a8f549d6ad807559097c8735afa2b39b7

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

Change-Id: I43fc706e88d78547aed43737ffadcb93b54da0bf

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

Change-Id: I8c430bb32412fca0af1efc5c3a13881af11a0884

[automerger skipped] Merge "Keep unforwarded operation for noted ops." into rvc-dev am: c784a29d am: 6eca51ab am: e8b16dea -s ours am: 7bc58e56 -s ours

am skip reason: Change-Id I3dcd8275b6229946875bc184d25b18d2da76d5ba with SHA-1 e44f134a is in history

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

Change-Id: Id6209792fa064a15461091cd31bcd58ca41a4bf5

[automerger skipped] Merge "Keep unforwarded operation for noted ops." into rvc-dev am: c784a29d am: 6eca51ab -s ours am: a1e13d53 -s ours am: 0929e5c8 -s ours

am skip reason: Change-Id I3dcd8275b6229946875bc184d25b18d2da76d5ba with SHA-1 e44f134a is in history

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

Change-Id: Iab870751cc0e9f0a0874d66a8d3b61fb9a02ca4f

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

Change-Id: Id402ba836f3b97f0467f4bc73264eb00ead2f5e1

[automerger skipped] Merge "Keep unforwarded operation for noted ops." into rvc-dev am: c784a29d am: 5a337a6a am: 6115a85d am: d8cd087b -s ours

am skip reason: Change-Id I3dcd8275b6229946875bc184d25b18d2da76d5ba with SHA-1 90720ca7 is in history

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

Change-Id: Ifd60cf15c647dbfff15f47c204d572c37c440c48

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

Change-Id: Ib4e0aec9e3805cb71657ec5f458b63a17d2fb3ab

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

Change-Id: Iba05ad9051487dfe285997e97b5075579602a88d

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

Change-Id: I3cd684c2f48b456efe4831a1bcb1dbffa9857c8c