summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-10-20Snap for 4381952 from 39184facf22b9237310cea345f4d90e34a938308 to oc-r6-releaseandroid-8.0.0_r32oreo-r6-releaselinaro-oreoandroid-build-team Robot
Change-Id: Iaee77a8353e3e5c47fde708de8e96ced97c8a513
2017-09-29Merge cherrypicks of [2986364] into oc-r4-releaseandroid-build-team Robot
Change-Id: I3bef3287934e09977c6387ea48e80b84a01358dc
2017-09-29Revert "Prevent getting data from Clipboard if device is locked"Adam Seaton
This reverts commit 93d77b07c34077b6c403c459b7bb75933446a502. Change-Id: I3ab20d3de1cb1e5fa94fffb8b69683b7508a3503 (cherry picked from commit 4fd5096fffb5aba9cde567981e28558e31e86345)
2017-09-21Merge cherrypicks of [2938191, 2937681, 2937682, 2938081, 2938082, 2938083, ↵android-build-team Robot
2938084, 2936625, 2936626, 2937945, 2937946, 2937947, 2937948, 2938729, 2938192, 2938193, 2938194, 2938195, 2938196, 2937683, 2937684, 2937685, 2938085, 2937965, 2938197, 2938388] into oc-r4-release Change-Id: I2116e90da1badcb88f27d08c53c8bb718f6a2967
2017-09-21Prevent getting data from Clipboard if device is lockedSiyamed Sinir
Clipboard should not return data if the device is locked. This CL checks for device locked state before returning values from get/has functions. Test: bit -t CtsContentTestCases:android.content.cts.ClipboardManagerTest Bug: 64934810 Change-Id: Icefac226615fe22a7735dff4ba4c3b528fb2ac12 (cherry picked from commit 93d77b07c34077b6c403c459b7bb75933446a502)
2017-09-21DPC should not be allowed to grant development permissionTony Mak
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --t com.android.cts.devicepolicy.MixedDeviceOwnerTest#testPermissionGrant_developmentPermission Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --t com.android.cts.devicepolicy.MixedProfileOwnerTest#testPermissionGrant_developmentPermission Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --t com.android.cts.devicepolicy.MixedDeviceOwnerTest#testPermissionGrant Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --t com.android.cts.devicepolicy.MixedProfileOwnerTest#testPermissionGrant Test: Run "Permissions lockdown" test in CtsVerifier Bug: 62623498 Merged-In: If83d8edd0eea99145421e967ae47fdc264a5cf7c Change-Id: I129bfe850981cf0b3646b7c1cf19c8a3ec69f512 (cherry picked from commit d05d2bac845048f84eebad8060d28332b6eda259)
2017-09-21Backport overlay security fixPhil Weaver
Replacing app opps fix with the flag that is used elsewhere. Bug: 37442941 Test: Verified that toast and system overlay still goes away on permission and a11y service capability screens. Merged-In: I1a3e3c5b1696a5f5b95eac187acb5a03863b4a0b Change-Id: If9bec515105369055415d54c7fcad7a65431f8e7 (cherry picked from commit c510ecb3ec0eeca5425f5bc96fae80ea56f85be6)
2017-08-28Merge cherrypicks of [2804820, 2804821] into oc-r4-releaseandroid-8.0.0_r16android-build-team Robot
Change-Id: Ie82b89ec161e2ff7996c190a2b1220b67948a59c
2017-08-28Improve AVRCP quality and state handling (2/2)Ajay Panicker
Bug: 64749777 Test: Play music with various car kits and see that metadata shows up See go/oc-avrcp-sotu - 8/15/20 OC + Patches for further info Change-Id: I58c9dd0bf976485a2efefd042cd667ee433e07e1 (cherry picked from commit 2a9eef7a3be53cb8da1e6e4f394062d0301474a3)
2017-08-23Merge cherrypicks of [2775117, 2775364, 2775365, 2775366, 2775118, 2775759, ↵android-build-team Robot
2775760, 2775367, 2775368, 2775731, 2775732, 2775369, 2775370, 2775371, 2775372, 2775373, 2775374, 2775375, 2775540, 2775541, 2775819, 2775820, 2775747, 2775748] into oc-r4-release Change-Id: If08ad081a27bcf8a4217d7826e9fc350dd0ea077
2017-08-23Fix security hole in GateKeeperResponse.Charles He
GateKeeperResponse has inconsistent writeToParcel() and createFromParcel() methods, making it possible for a malicious app to create a Bundle that changes contents after reserialization. Such Bundles can be used to execute Intents with system privileges. This CL changes writeToParcel() to make serialization and deserialization consistent, thus fixing the issue. Bug: 62998805 Test: use the debug app (see bug) Change-Id: Ie1c64172c454c3a4b7a0919eb3454f0e38efcd09 (cherry picked from commit e74cae8f7c3e6b12f2bf2b75427ee8f5b53eca3c)
2017-08-23Enforce policy for camera gesture in keyguardEsteban Talavera
If the admin has disabled the camera for secure keyguards, in addition to removing the bottom-right hand corner camera button do not allow the camera to be opened via the camera gesture either. Bug: 63334090 Merged-In: I104688eaad719528376e2851f837d5956a6a1169 Test: Manually tested launching the camera on secure and non-secure keyguard and non-keyguard, both via camera icon and gesture Change-Id: I104688eaad719528376e2851f837d5956a6a1169 (cherry picked from commit 98ec92375d75630c10595bfcbae184ad7350e2d3)
2017-08-17Properly compute default and system set flag on an upgradeandroid-8.0.0_r12android-8.0.0_r11Svetoslav Ganov
We added the notions of a default value and whether this default is set by the system for a setting which is needed for experiments since in case a bad value is pushed we should be able to incrementally rollback to a stable state. If a system component sets a setting value this automatically becomes the default. System components are the platform package, the special UIDs (telephony, etc), apps singed with the platform cert, system installed persistent apps, and SUW. In N we did not have the notion of a default and during an upgrade need to adjust the default and whether this default is set by the system. This migration runs as the system UID and was incorrectly computing that the package that changed the settings last was a part of the system and setting the current value as its default set by the system. This resulted in taking more storage space as we also count the default which led the package which changed the setting to go over the quota and that throws. If the first caller into the settings provider is the system main thread (almost certain) we end up throwing an exception on the system main thread - crashing the system server. Test: flash N, install an app abusing sys settings, update to O Merged-In:I8e2c578cb564b2bc2de7c793eb40dea2639fa04e bug:64718888 Change-Id: I82f0d52fd7984fb2d0da1fd91399a0c914dfa24b
2017-08-17merge in oc-r6-release history after reset to oc-releasegitbuildkicker
2017-08-17Properly compute default and system set flag on an upgradeSvetoslav Ganov
We added the notions of a default value and whether this default is set by the system for a setting which is needed for experiments since in case a bad value is pushed we should be able to incrementally rollback to a stable state. If a system component sets a setting value this automatically becomes the default. System components are the platform package, the special UIDs (telephony, etc), apps singed with the platform cert, system installed persistent apps, and SUW. In N we did not have the notion of a default and during an upgrade need to adjust the default and whether this default is set by the system. This migration runs as the system UID and was incorrectly computing that the package that changed the settings last was a part of the system and setting the current value as its default set by the system. This resulted in taking more storage space as we also count the default which led the package which changed the setting to go over the quota and that throws. If the first caller into the settings provider is the system main thread (almost certain) we end up throwing an exception on the system main thread - crashing the system server. Test: flash N, install an app abusing sys settings, update to O Merged-In:I8e2c578cb564b2bc2de7c793eb40dea2639fa04e bug:64718888 Change-Id: I82f0d52fd7984fb2d0da1fd91399a0c914dfa24b
2017-08-17merge in oc-r6-release history after reset to oc-releasegitbuildkicker
2017-08-17Properly compute default and system set flag on an upgradeandroid-8.0.0_r4Svetoslav Ganov
We added the notions of a default value and whether this default is set by the system for a setting which is needed for experiments since in case a bad value is pushed we should be able to incrementally rollback to a stable state. If a system component sets a setting value this automatically becomes the default. System components are the platform package, the special UIDs (telephony, etc), apps singed with the platform cert, system installed persistent apps, and SUW. In N we did not have the notion of a default and during an upgrade need to adjust the default and whether this default is set by the system. This migration runs as the system UID and was incorrectly computing that the package that changed the settings last was a part of the system and setting the current value as its default set by the system. This resulted in taking more storage space as we also count the default which led the package which changed the setting to go over the quota and that throws. If the first caller into the settings provider is the system main thread (almost certain) we end up throwing an exception on the system main thread - crashing the system server. Test: flash N, install an app abusing sys settings, update to O Merged-In:I8e2c578cb564b2bc2de7c793eb40dea2639fa04e bug:64718888 Change-Id: I82f0d52fd7984fb2d0da1fd91399a0c914dfa24b
2017-08-17merge in oc-r6-release history after reset to oc-releasegitbuildkicker
2017-08-17Properly compute default and system set flag on an upgradeandroid-8.0.0_r3Svetoslav Ganov
We added the notions of a default value and whether this default is set by the system for a setting which is needed for experiments since in case a bad value is pushed we should be able to incrementally rollback to a stable state. If a system component sets a setting value this automatically becomes the default. System components are the platform package, the special UIDs (telephony, etc), apps singed with the platform cert, system installed persistent apps, and SUW. In N we did not have the notion of a default and during an upgrade need to adjust the default and whether this default is set by the system. This migration runs as the system UID and was incorrectly computing that the package that changed the settings last was a part of the system and setting the current value as its default set by the system. This resulted in taking more storage space as we also count the default which led the package which changed the setting to go over the quota and that throws. If the first caller into the settings provider is the system main thread (almost certain) we end up throwing an exception on the system main thread - crashing the system server. Test: flash N, install an app abusing sys settings, update to O Merged-In:I8e2c578cb564b2bc2de7c793eb40dea2639fa04e bug:64718888 Change-Id: I82f0d52fd7984fb2d0da1fd91399a0c914dfa24b
2017-08-17merge in oc-r6-release history after reset to oc-releasegitbuildkicker
2017-08-17Properly compute default and system set flag on an upgradeandroid-8.0.0_r2Svetoslav Ganov
We added the notions of a default value and whether this default is set by the system for a setting which is needed for experiments since in case a bad value is pushed we should be able to incrementally rollback to a stable state. If a system component sets a setting value this automatically becomes the default. System components are the platform package, the special UIDs (telephony, etc), apps singed with the platform cert, system installed persistent apps, and SUW. In N we did not have the notion of a default and during an upgrade need to adjust the default and whether this default is set by the system. This migration runs as the system UID and was incorrectly computing that the package that changed the settings last was a part of the system and setting the current value as its default set by the system. This resulted in taking more storage space as we also count the default which led the package which changed the setting to go over the quota and that throws. If the first caller into the settings provider is the system main thread (almost certain) we end up throwing an exception on the system main thread - crashing the system server. Test: flash N, install an app abusing sys settings, update to O Merged-In:I8e2c578cb564b2bc2de7c793eb40dea2639fa04e bug:64718888 Change-Id: I82f0d52fd7984fb2d0da1fd91399a0c914dfa24b
2017-08-17merge in oc-r6-release history after reset to oc-releasegitbuildkicker
2017-08-17Merge cherrypicks of [2749916] into oc-r4-releaseandroid-8.0.0_r10android-build-team Robot
Change-Id: Ice4e4b8556ffddcd902769cf50ea4e39f01f4a75
2017-08-17Properly compute default and system set flag on an upgradeSvetoslav Ganov
We added the notions of a default value and whether this default is set by the system for a setting which is needed for experiments since in case a bad value is pushed we should be able to incrementally rollback to a stable state. If a system component sets a setting value this automatically becomes the default. System components are the platform package, the special UIDs (telephony, etc), apps singed with the platform cert, system installed persistent apps, and SUW. In N we did not have the notion of a default and during an upgrade need to adjust the default and whether this default is set by the system. This migration runs as the system UID and was incorrectly computing that the package that changed the settings last was a part of the system and setting the current value as its default set by the system. This resulted in taking more storage space as we also count the default which led the package which changed the setting to go over the quota and that throws. If the first caller into the settings provider is the system main thread (almost certain) we end up throwing an exception on the system main thread - crashing the system server. Test: flash N, install an app abusing sys settings, update to O Merged-In:I8e2c578cb564b2bc2de7c793eb40dea2639fa04e bug:64718888 Change-Id: I82f0d52fd7984fb2d0da1fd91399a0c914dfa24b (cherry picked from commit eb1936cb98a25a437ce90ebdbdc6f09a96e7d6a9)
2017-08-17Properly compute default and system set flag on an upgradeandroid-8.0.0_r1Svetoslav Ganov
We added the notions of a default value and whether this default is set by the system for a setting which is needed for experiments since in case a bad value is pushed we should be able to incrementally rollback to a stable state. If a system component sets a setting value this automatically becomes the default. System components are the platform package, the special UIDs (telephony, etc), apps singed with the platform cert, system installed persistent apps, and SUW. In N we did not have the notion of a default and during an upgrade need to adjust the default and whether this default is set by the system. This migration runs as the system UID and was incorrectly computing that the package that changed the settings last was a part of the system and setting the current value as its default set by the system. This resulted in taking more storage space as we also count the default which led the package which changed the setting to go over the quota and that throws. If the first caller into the settings provider is the system main thread (almost certain) we end up throwing an exception on the system main thread - crashing the system server. Test: flash N, install an app abusing sys settings, update to O Merged-In:I8e2c578cb564b2bc2de7c793eb40dea2639fa04e bug:64718888 Change-Id: I82f0d52fd7984fb2d0da1fd91399a0c914dfa24b
2017-08-17merge in oc-r6-release history after reset to oc-releasegitbuildkicker
2017-08-17Properly compute default and system set flag on an upgradeSvetoslav Ganov
We added the notions of a default value and whether this default is set by the system for a setting which is needed for experiments since in case a bad value is pushed we should be able to incrementally rollback to a stable state. If a system component sets a setting value this automatically becomes the default. System components are the platform package, the special UIDs (telephony, etc), apps singed with the platform cert, system installed persistent apps, and SUW. In N we did not have the notion of a default and during an upgrade need to adjust the default and whether this default is set by the system. This migration runs as the system UID and was incorrectly computing that the package that changed the settings last was a part of the system and setting the current value as its default set by the system. This resulted in taking more storage space as we also count the default which led the package which changed the setting to go over the quota and that throws. If the first caller into the settings provider is the system main thread (almost certain) we end up throwing an exception on the system main thread - crashing the system server. Test: flash N, install an app abusing sys settings, update to O Merged-In:I8e2c578cb564b2bc2de7c793eb40dea2639fa04e bug:64718888 Change-Id: I82f0d52fd7984fb2d0da1fd91399a0c914dfa24b
2017-08-17merge in oc-r6-release history after reset to oc-releasegitbuildkicker
2017-08-17Properly compute default and system set flag on an upgradeSvetoslav Ganov
We added the notions of a default value and whether this default is set by the system for a setting which is needed for experiments since in case a bad value is pushed we should be able to incrementally rollback to a stable state. If a system component sets a setting value this automatically becomes the default. System components are the platform package, the special UIDs (telephony, etc), apps singed with the platform cert, system installed persistent apps, and SUW. In N we did not have the notion of a default and during an upgrade need to adjust the default and whether this default is set by the system. This migration runs as the system UID and was incorrectly computing that the package that changed the settings last was a part of the system and setting the current value as its default set by the system. This resulted in taking more storage space as we also count the default which led the package which changed the setting to go over the quota and that throws. If the first caller into the settings provider is the system main thread (almost certain) we end up throwing an exception on the system main thread - crashing the system server. Test: flash N, install an app abusing sys settings, update to O Merged-In:I8e2c578cb564b2bc2de7c793eb40dea2639fa04e bug:64718888 Change-Id: I82f0d52fd7984fb2d0da1fd91399a0c914dfa24b
2017-08-17merge in oc-r6-release history after reset to oc-releasegitbuildkicker
2017-08-17Properly compute default and system set flag on an upgradeSvetoslav Ganov
We added the notions of a default value and whether this default is set by the system for a setting which is needed for experiments since in case a bad value is pushed we should be able to incrementally rollback to a stable state. If a system component sets a setting value this automatically becomes the default. System components are the platform package, the special UIDs (telephony, etc), apps singed with the platform cert, system installed persistent apps, and SUW. In N we did not have the notion of a default and during an upgrade need to adjust the default and whether this default is set by the system. This migration runs as the system UID and was incorrectly computing that the package that changed the settings last was a part of the system and setting the current value as its default set by the system. This resulted in taking more storage space as we also count the default which led the package which changed the setting to go over the quota and that throws. If the first caller into the settings provider is the system main thread (almost certain) we end up throwing an exception on the system main thread - crashing the system server. Test: flash N, install an app abusing sys settings, update to O Merged-In:I8e2c578cb564b2bc2de7c793eb40dea2639fa04e bug:64718888 Change-Id: I82f0d52fd7984fb2d0da1fd91399a0c914dfa24b
2017-08-17merge in oc-r6-release history after reset to oc-releasegitbuildkicker
2017-08-17Properly compute default and system set flag on an upgradeSvetoslav Ganov
We added the notions of a default value and whether this default is set by the system for a setting which is needed for experiments since in case a bad value is pushed we should be able to incrementally rollback to a stable state. If a system component sets a setting value this automatically becomes the default. System components are the platform package, the special UIDs (telephony, etc), apps singed with the platform cert, system installed persistent apps, and SUW. In N we did not have the notion of a default and during an upgrade need to adjust the default and whether this default is set by the system. This migration runs as the system UID and was incorrectly computing that the package that changed the settings last was a part of the system and setting the current value as its default set by the system. This resulted in taking more storage space as we also count the default which led the package which changed the setting to go over the quota and that throws. If the first caller into the settings provider is the system main thread (almost certain) we end up throwing an exception on the system main thread - crashing the system server. Test: flash N, install an app abusing sys settings, update to O Merged-In:I8e2c578cb564b2bc2de7c793eb40dea2639fa04e bug:64718888 Change-Id: I82f0d52fd7984fb2d0da1fd91399a0c914dfa24b
2017-08-17merge in oc-r6-release history after reset to oc-releasegitbuildkicker
2017-08-17Properly compute default and system set flag on an upgradeSvetoslav Ganov
We added the notions of a default value and whether this default is set by the system for a setting which is needed for experiments since in case a bad value is pushed we should be able to incrementally rollback to a stable state. If a system component sets a setting value this automatically becomes the default. System components are the platform package, the special UIDs (telephony, etc), apps singed with the platform cert, system installed persistent apps, and SUW. In N we did not have the notion of a default and during an upgrade need to adjust the default and whether this default is set by the system. This migration runs as the system UID and was incorrectly computing that the package that changed the settings last was a part of the system and setting the current value as its default set by the system. This resulted in taking more storage space as we also count the default which led the package which changed the setting to go over the quota and that throws. If the first caller into the settings provider is the system main thread (almost certain) we end up throwing an exception on the system main thread - crashing the system server. Test: flash N, install an app abusing sys settings, update to O Merged-In:I8e2c578cb564b2bc2de7c793eb40dea2639fa04e bug:64718888 Change-Id: I82f0d52fd7984fb2d0da1fd91399a0c914dfa24b
2017-08-17merge in oc-r6-release history after reset to oc-releasegitbuildkicker
2017-08-17Properly compute default and system set flag on an upgradeSvetoslav Ganov
We added the notions of a default value and whether this default is set by the system for a setting which is needed for experiments since in case a bad value is pushed we should be able to incrementally rollback to a stable state. If a system component sets a setting value this automatically becomes the default. System components are the platform package, the special UIDs (telephony, etc), apps singed with the platform cert, system installed persistent apps, and SUW. In N we did not have the notion of a default and during an upgrade need to adjust the default and whether this default is set by the system. This migration runs as the system UID and was incorrectly computing that the package that changed the settings last was a part of the system and setting the current value as its default set by the system. This resulted in taking more storage space as we also count the default which led the package which changed the setting to go over the quota and that throws. If the first caller into the settings provider is the system main thread (almost certain) we end up throwing an exception on the system main thread - crashing the system server. Test: flash N, install an app abusing sys settings, update to O Merged-In:I8e2c578cb564b2bc2de7c793eb40dea2639fa04e bug:64718888 Change-Id: I82f0d52fd7984fb2d0da1fd91399a0c914dfa24b
2017-08-17merge in oc-r6-release history after reset to oc-releasegitbuildkicker
2017-08-17Merge cherrypicks of [2745556] into oc-r6-releaseandroid-build-team Robot
Change-Id: I0f692e95466c5aeaced6c26215baa655f5ea930c
2017-08-17Properly compute default and system set flag on an upgradeSvetoslav Ganov
We added the notions of a default value and whether this default is set by the system for a setting which is needed for experiments since in case a bad value is pushed we should be able to incrementally rollback to a stable state. If a system component sets a setting value this automatically becomes the default. System components are the platform package, the special UIDs (telephony, etc), apps singed with the platform cert, system installed persistent apps, and SUW. In N we did not have the notion of a default and during an upgrade need to adjust the default and whether this default is set by the system. This migration runs as the system UID and was incorrectly computing that the package that changed the settings last was a part of the system and setting the current value as its default set by the system. This resulted in taking more storage space as we also count the default which led the package which changed the setting to go over the quota and that throws. If the first caller into the settings provider is the system main thread (almost certain) we end up throwing an exception on the system main thread - crashing the system server. Test: flash N, install an app abusing sys settings, update to O bug:64718888 Change-Id: I82f0d52fd7984fb2d0da1fd91399a0c914dfa24b (cherry picked from commit bf91d4072f2b91969a17028f8b21d72f004cc6af)
2017-08-14release-request-49e3b466-076f-42b5-804c-ed9aab783aec-for-git_oc-r5-release-4 ↵android-build-team Robot
255676 snap-temp-L37500000092850661 Change-Id: I2515c672ad65128ec95b87aaa899a3eeffc56a3a
2017-08-01release-request-c97384e1-6d1a-4702-a8a5-8d55b212d219-for-git_oc-r2-release-4 ↵android-build-team Robot
229080 snap-temp-L18600000088000237 Change-Id: If71366fc4817ac6e501e7b9bd0dbfac213730fff
2017-07-29Merge cherrypicks of [2627701] into oc-releaseandroid-build-team Robot
Change-Id: I13dba40107ad2acef7dbe717fcd01f39dbc9ad49
2017-07-29Add a missing null checkSvet Ganov
Test: manual bug::62755026 Change-Id: Icf719d0e62986febd4d31f22be3e59d83c8e6e09 (cherry picked from commit 0ae9570c9925603a04d5a78775a68cc9d437542b)
2017-07-28Merge cherrypicks of [2624661, 2624224] into oc-releaseandroid-build-team Robot
Change-Id: I37c6e10bca102f2cea44717868c3aac4267ad02e
2017-07-28Handle case for missing permissions - fix NPESvet Ganov
Test: manual Bug:62755026 Change-Id: Ie4dddffdb055f6084d9420ae94d0de2a61574bd8 (cherry picked from commit 39cc33f192d528f250818446ea0418aaf0cfe41f)
2017-07-28Merge cherrypicks of [2622852, 2622193, 2622194, 2622195, 2622933, 2622990, ↵android-build-team Robot
2622991, 2622992, 2622993, 2622994, 2622995, 2622934, 2622196, 2622975, 2622996, 2622997, 2622998, 2623050, 2622935, 2622197, 2623051, 2622936, 2622918, 2622919, 2622999] into oc-release Change-Id: I797b38442045e5165db55d70617201e8338bc5cc
2017-07-28Report permission flags for all protections based on SDKSvetoslav Ganov
We added a couple of protection flags that also apply to normal and dangerous permissions. These flags are folded in the protection level breaking apps that directly and compare against the protection constants. Apps that target older than O SDK don't get protection flags folded into the protection level. Test: All permission tests pass Added a new test to ensure no protection flags reported for normal and dangerous permissions Change-Id: I87b10a7695d8ecfa7156525d6f3d101fc0639513 bug:62755026 (cherry picked from commit adb8c522a84b5c7531b009b7a8d4c854ca7dee08)
2017-07-28Import translations. DO NOT MERGEBill Yi
Change-Id: I640b8c920e55d419bd52e767ff15764d0921ae08 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import (cherry picked from commit d6d188b8271ef850f8806029a4349c1aa65f012c)
2017-07-28Import translations. DO NOT MERGEBill Yi
Change-Id: I8e7ec46b61a5122fbd12d08160c2be3144d4f561 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import (cherry picked from commit 23a34a9e686f6fe20d6d22da2b3481dc5de9d5ad)