Bug: 150252746
Bug: 151443957
Test: m libRS
Change-Id: I3cad2b6d48faa0a0b49b9c2de265b2dc664d6456

Merge "Update prebuilt CTS shim pkgs with the ones built on server" into rvc-dev am: 1fb1d686 am: 34159297 am: 2c902e69 am: 49494626

Change-Id: I833f88b52285af5869149ec29c8c2091c95bfa93

Merge "Update prebuilt CTS shim pkgs with the ones built on server" into rvc-dev am: 1fb1d686 am: 976b81fc am: a9c02b3f am: 8cf4d655 am: 231c2594

Change-Id: I444a3316c8fb04361963b19186b4c683df8ddd45

[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 42fb475e -s ours am: 58b5e460 -s ours am: 1e534304 -s ours am: 3a7c9e82 -s ours

am skip reason: subject contains skip directive

Change-Id: Ie6ee284e6ce4177c434a2672814c231a7d89d339

[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 42fb475e -s ours am: f31195c9 -s ours am: 3ae14ce3 -s ours am: bb4e7b31 -s ours am: f672c2a4 -s ours

am skip reason: subject contains skip directive

Change-Id: I19780ceb55ae4cc68c66bb4fa18c08a358e3c7fe

[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4f9340ce -s ours am: 4250cc10 -s ours am: b606e0a6 -s ours am: d1b5bed5 -s ours am: 9723b887 -s ours

am skip reason: subject contains skip directive

Change-Id: Ie08d9e6040874c93290dcae5bf03cb13bb291280

[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 39c05894 -s ours am: d8d7595a -s ours am: 22c9eb49 -s ours am: 8c6022c8 -s ours am: 3b320a4b -s ours

am skip reason: subject contains skip directive

Change-Id: Ie985f7aad7dd55cca924b97fa84bc5ee0688b73b

[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 2dd027f2 -s ours am: 2f448f31 -s ours am: ddbcba27 -s ours am: cadbcca5 -s ours am: db4eeb33 -s ours

am skip reason: subject contains skip directive

Change-Id: I020eefd4eb768ee7f63734a83786f3260fb6f9b1

[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 840d47d1 -s ours am: 33aa2e50 -s ours am: 5bc86590 -s ours am: e2eb4fcc -s ours am: 2bb9a9a8 -s ours

am skip reason: subject contains skip directive

Change-Id: I4015c1de43dc715e812cd901053aad6767d17533

Merge "Set max items to 4 on lock screen, re-disable overflow." into rvc-dev am: d41bdc07 am: beae6de4 am: 0dcee1fb am: 950f61bf am: 0ae09b41

Change-Id: I15d6d0d9cdb7da055b47dbe8824a63e0128b8a8b

[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6952230a -s ours am: df32a933 -s ours am: 01cc1387 -s ours am: a7b297e5 -s ours am: ea2ca5af -s ours

am skip reason: subject contains skip directive

Change-Id: I9a942fb3b6f59800b16beb8080dd4859a6ce8b11

[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05994d3f -s ours am: e7c48df7 -s ours am: 68d21db1 -s ours am: dcc3c346 -s ours am: 0168ca1d -s ours

am skip reason: subject contains skip directive

Change-Id: I07caceb0487dafb70b02a319aad63b16dc723808

[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a157147d -s ours am: 40bd90c3 -s ours am: ae54c560 -s ours am: 2f94d66d -s ours am: 5a2ee21a -s ours

am skip reason: subject contains skip directive

Change-Id: I562b350ecc0ad5f6421bd82fbe25115a9eb396bb

Merge "Merge "Update prebuilt CTS shim pkgs with the ones built on server" into rvc-dev am: 1fb1d686 am: 976b81fc am: a26323ff" into rvc-qpr-dev-plus-aosp am: f340eae8

Change-Id: I6c8845281f4f631cb0f40159df52260dfddfa715

Merge "Pass actual plugin to PluginInstanceManager.MainHandler." into rvc-dev am: 755bf9e0 am: e5b21c78 am: cbce2e83 am: 3c303d24 am: 4bd92d31

Change-Id: I5b694994026748de9bf48529024c6e89e7a68440

Merge "Merge changes from topics "displayinfocontroller", "remove_displayinfo" into rvc-dev am: 5227e844 am: 88e7e04e am: 55caa6f6 am: c30061fd" into rvc-qpr-dev-plus-aosp am: 950a813d

Change-Id: Idf1c8ccbccdd7de08f357ca7ec3d4599878a1242

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 42fb475e -s ours am: f31195c9 -s ours" into rvc-d1-dev-plus-aosp am: 8b0d3aec -s ours am: 4f7271e4 -s ours

am skip reason: subject contains skip directive

Change-Id: Iefa4f5d9cfd07f0909889ac203f0a4feee2892e7

[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ca47e7b0 -s ours am: f108d31f -s ours am: 505f90eb -s ours am: 2d27c6a4 -s ours am: 24e0e87c -s ours

am skip reason: subject contains skip directive

Change-Id: Iedcfb64bbb8c7d94be856036f9a4215b52109e4a

Merge "No scrolling in overflow" into rvc-dev am: e01e3a69 am: b63d39c5 am: 946841ce am: 4e108e2b am: 97487cf2

Change-Id: I2b5fe4764e9ec137e9fbd31fc4c4842591a4a315

Merge "Revert "Remove bubble when PendingIntent is canceled"" into rvc-dev am: 7f042aaa am: 55cafb55 am: 6de165ea am: f38c921d am: c15201da

Change-Id: I47f109f9348051b9fcec06ae4fee74d606c2d020

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4f9340ce -s ours am: 9782cc11 -s ours" into rvc-d1-dev-plus-aosp am: 801c6c84 -s ours am: 1fd5a1db -s ours

am skip reason: subject contains skip directive

Change-Id: Icbb0a584abb4373bc74f60fdd298e62bd4cca2fd

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4f9340ce -s ours am: 4250cc10 -s ours" into rvc-d1-dev-plus-aosp am: e51c2473 -s ours am: 584356af -s ours

am skip reason: subject contains skip directive

Change-Id: I6238b9bbe2f5bba29399b8fa556f45d116a51f17

[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 39c05894 -s ours am: 5b90134f -s ours am: b3726344 -s ours am: 963b1bbd -s ours

am skip reason: subject contains skip directive

Change-Id: Ic50dcd30ffcfe8c090c8aca7dcf93f52cb1c1f3d

[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 39c05894 -s ours am: d8d7595a -s ours am: c5f8e7ee -s ours am: 2ef554be -s ours

am skip reason: subject contains skip directive

Change-Id: I9692680743f0f697bba8b3a3cbd4856f6944b075

[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 2dd027f2 -s ours am: 2f448f31 -s ours am: 0ff18f9e -s ours am: cd07fdc0 -s ours

am skip reason: subject contains skip directive

Change-Id: I08eed43560a3de396f98c4d1c1a42eed0bdd3261

Merge "[automerger skipped] Merge "Cache getDefaultDataSubscriptionId Binder calls" into rvc-dev am: f2f45653 am: bdc04234 am: 1bc59a55 am: dfcae5a9 -s ours" into rvc-qpr-dev-plus-aosp am: 020d6e8f -s ours

am skip reason: Change-Id Ifbd380a9281d7bc9c3a9b35c5e93207acabf8d15 with SHA-1 ce43a598 is in history

Change-Id: I751f7129e71c92b503bde8ebd332462e190efef8

[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 2dd027f2 -s ours am: c803ad6a -s ours am: c786c915 -s ours am: 7e47653a -s ours

am skip reason: subject contains skip directive

Change-Id: I9d138fdc0f41478a8a3b6c7814ea250940ee4145

Merge "Make SystemUI config extendable" into rvc-dev am: d5b5453d am: 11c54a7a am: db73a833 am: 05c22a23 am: 5434a7de

Change-Id: I3b4c6b6b830c55bd7882928b0799b60ba534eee6

[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 840d47d1 -s ours am: 87524eac -s ours am: 3026afe4 -s ours am: 792666dd -s ours

am skip reason: subject contains skip directive

Change-Id: I95451be1416a5412708dd7b83e3db77726152049

Merge "Set max items to 4 on lock screen, re-disable overflow." into rvc-dev am: d41bdc07 am: e5136e95 am: ae7636e1 am: 5095c7fe

Change-Id: I9a871ac7e6d9748ffaccdbebc076489a522845d0

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6952230a -s ours am: 92c24ea8 -s ours am: da2a235e -s ours" into rvc-qpr-dev-plus-aosp am: ffd5d13b -s ours

am skip reason: subject contains skip directive

Change-Id: I690da96d905419ce0de59ab7f871f5250bb189a3

Merge "Add @TestApi to createLaunchEmergencyDialerIntent" into rvc-dev am: b9c99178 am: 64750d74 am: 0877a937 am: 65a784c2 am: d3837433

Change-Id: Ic21d7b178ef12e6ba0d873cd99d7d9265ba782e4

Merge "Update prebuilt CTS shim pkgs with the ones built on server" into rvc-dev am: 1fb1d686 am: 34159297 am: 2c902e69

Change-Id: I9c51cd0efa0a9229764066725bbd210895ef187b

[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05994d3f -s ours am: 6742e3a7 -s ours am: 8acd03de -s ours am: 84b8c78a -s ours

am skip reason: subject contains skip directive

Change-Id: Ie035aaeaec5b8cce7035d4cce41d2264ecf71f39

[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 840d47d1 -s ours am: 33aa2e50 -s ours am: 3a4371ce -s ours am: 8c18da0a -s ours

am skip reason: subject contains skip directive

Change-Id: Ia5e097ab5208dfbe3e8ac2aebebaa4505f473b77

Merge "Update prebuilt CTS shim pkgs with the ones built on server" into rvc-dev am: 1fb1d686 am: 976b81fc am: a9c02b3f am: 8cf4d655

Change-Id: I32afe0907f69c9b15d631af950796352cfd3bfc1

Merge "Set max items to 4 on lock screen, re-disable overflow." into rvc-dev am: d41bdc07 am: beae6de4 am: 06f64d44 am: f9937598

Change-Id: Ie29871d794e88626211d34fedec45f4d8562c131

[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6952230a -s ours am: df32a933 -s ours am: 37831bc2 -s ours am: 191fddbd -s ours

am skip reason: subject contains skip directive

Change-Id: I021da479c964acf7838ec41dfb685693d6b0660c

[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 42fb475e -s ours am: 58b5e460 -s ours am: 1e534304 -s ours

am skip reason: subject contains skip directive

Change-Id: I2ef905a0507bf8663032c5685926c2802de67a0d

[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05994d3f -s ours am: e7c48df7 -s ours am: cfcf9fec -s ours am: 572d560a -s ours

am skip reason: subject contains skip directive

Change-Id: Icd1abf7e14bd1a407bb1d92e600085473b31865d